author | Xindong Xu <xindong.xu@amlogic.com> | 2018-03-26 11:07:35 (GMT) |
---|---|---|
committer | Xindong Xu <xindong.xu@amlogic.com> | 2018-03-26 11:07:35 (GMT) |
commit | aa06bbb6b60a7027a40eaf0e2bbd50753ef3794f (patch) | |
tree | e899d50e0d1f65f618a4ddbc873f59d1a3272f36 | |
parent | 2fa189f6c0b681a8c79842bf5b97064eb9bab1f7 (diff) | |
download | braun-aa06bbb6b60a7027a40eaf0e2bbd50753ef3794f.zip braun-aa06bbb6b60a7027a40eaf0e2bbd50753ef3794f.tar.gz braun-aa06bbb6b60a7027a40eaf0e2bbd50753ef3794f.tar.bz2 |
braun: sync to o-ref [1/1]
PD# NONE
build 32 bit default
Change-Id: I8d0bcf6dd9429fb435086c859346e700b245115e
-rw-r--r-- | BoardConfig.mk | 2 | ||||
-rw-r--r-- | Kernel.mk | 2 | ||||
-rw-r--r--[-rwxr-xr-x] | braun.mk | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk index 63a5825..d070577 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -ifeq ($(ANDROID_BUILD_TYPE), 32) +ifneq ($(ANDROID_BUILD_TYPE), 64) TARGET_CPU_ABI := armeabi-v7a TARGET_CPU_ABI2 := armeabi TARGET_CPU_SMP := true @@ -31,6 +31,8 @@ $(TARGET_PREBUILT_KERNEL): $(INSTALLED_BOARDDTB_TARGET) cp device/amlogic/braun-kernel/tdk/* $(PRODUCT_OUT)/obj/lib/ cp device/amlogic/braun-kernel/tdk/* $(PRODUCT_OUT)/root/boot/ cp device/amlogic/braun-kernel/tdk/* $(PRODUCT_OUT)/recovery/root/boot/ + -cp device/amlogic/braun-kernel/lib/optee_armtz.ko $(PRODUCT_OUT)/vendor/lib/ + -cp device/amlogic/braun-kernel/lib/optee.ko $(PRODUCT_OUT)/vendor/lib/ cp device/amlogic/braun-kernel/lib/firmware/video/* $(PRODUCT_OUT)/vendor/lib/firmware/video/ -cp device/amlogic/braun-kernel/obj/KERNEL_OBJ/vmlinux $(PRODUCT_OUT)/obj/KERNEL_OBJ/ mkdir -p $(PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR)/lib/modules/ @@ -17,14 +17,12 @@ # build for Meson reference board. # -ANDROID_BUILD_TYPE := 32 - # Dynamic enable start/stop zygote_secondary in 64bits # and 32bit system, default closed #TARGET_DYNAMIC_ZYGOTE_SECONDARY_ENABLE := true # Inherit from those products. Most specific first. -ifneq ($(ANDROID_BUILD_TYPE), 32) +ifeq ($(ANDROID_BUILD_TYPE), 64) ifeq ($(TARGET_DYNAMIC_ZYGOTE_SECONDARY_ENABLE), true) $(call inherit-product, device/amlogic/common/dynamic_zygote_seondary/dynamic_zygote_64_bit.mk) else |