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

PD# NONE

build 32 bit default

Change-Id: I8d0bcf6dd9429fb435086c859346e700b245115e

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
diff --git a/Kernel.mk b/Kernel.mk
index 57ff719..c642762 100644
--- a/Kernel.mk
+++ b/Kernel.mk
@@ -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/
diff --git a/braun.mk b/braun.mk
index 5a62eed..9691379 100755..100644
--- a/braun.mk
+++ b/braun.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