curie: sync to o-ref [1/1]

PD# NONE

build 32 bit default

Change-Id: I6869ef59d5110c8f3848887fe7c76d642ca4e53e

3 files changed, 4 insertions, 2 deletions

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 6e7e292..eb9ffc0 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
diff --git a/Kernel.mk b/Kernel.mk
index e1243ea..dbd4c47 100644
--- a/Kernel.mk
+++ b/Kernel.mk
@@ -31,6 +31,8 @@ $(TARGET_PREBUILT_KERNEL): $(INSTALLED_BOARDDTB_TARGET)
 	cp device/amlogic/curie-kernel/tdk/* $(PRODUCT_OUT)/obj/lib/
 	cp device/amlogic/curie-kernel/tdk/* $(PRODUCT_OUT)/root/boot/
 	cp device/amlogic/curie-kernel/tdk/* $(PRODUCT_OUT)/recovery/root/boot/
+	-cp device/amlogic/curie-kernel/lib/optee_armtz.ko $(PRODUCT_OUT)/vendor/lib/
+	-cp device/amlogic/curie-kernel/lib/optee.ko $(PRODUCT_OUT)/vendor/lib/
 	cp device/amlogic/curie-kernel/lib/firmware/video/* $(PRODUCT_OUT)/vendor/lib/firmware/video/
 	-cp device/amlogic/curie-kernel/obj/KERNEL_OBJ/vmlinux $(PRODUCT_OUT)/obj/KERNEL_OBJ/
 	mkdir -p $(PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR)/lib/modules/
diff --git a/curie.mk b/curie.mk
index 96e1831..6e9c9cc 100644
--- a/curie.mk
+++ b/curie.mk
@@ -24,7 +24,7 @@ ANDROID_BUILD_TYPE := 32
 #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