From b5e7c2edc9a406eafcbef9d0013efc697452cfc5 Mon Sep 17 00:00:00 2001 From: Xindong Xu Date: Mon, 26 Mar 2018 11:11:08 +0000 Subject: einstein: sync to o-ref [1/1] PD# NONE build 32 bit default Change-Id: Ia9cbe3cb6d2cb56af7465309913deb0c7e377282 --- diff --git a/BoardConfig.mk b/BoardConfig.mk index 2743f46..88a59a3 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -14,7 +14,7 @@ # 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 diff --git a/device.mk b/device.mk index ef61b69..008ccd2 100644 --- a/device.mk +++ b/device.mk @@ -77,7 +77,7 @@ PRODUCT_COPY_FILES += \ device/amlogic/einstein/files/tv/tv_rrt_define.xml:$(TARGET_COPY_OUT_VENDOR)/etc/tv_rrt_define.xml #einstein tuner PRODUCT_COPY_FILES += \ - device/amlogic/einstein/files/tv/mxl661_fe.ko:root/boot/mxl661_fe.ko + device/amlogic/einstein/files/tv/mxl661_fe.ko:$(TARGET_COPY_OUT_VENDOR)/lib/mxl661_fe.ko PRODUCT_AAPT_CONFIG := xlarge hdpi xhdpi PRODUCT_AAPT_PREF_CONFIG := hdpi diff --git a/einstein.mk b/einstein.mk index 673a422..9f7285e 100755..100644 --- a/einstein.mk +++ b/einstein.mk @@ -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 diff --git a/init.amlogic.board.rc b/init.amlogic.board.rc index a99c663..5ac114a 100644 --- a/init.amlogic.board.rc +++ b/init.amlogic.board.rc @@ -6,7 +6,7 @@ on early-init mount configfs configfs /sys/kernel/config #mount usbfs none /proc/bus/usb -# insmod /boot/mxl661_fe.ko +# insmod /vendor/lib/mxl661_fe.ko on init -- cgit