commit 336202c0e50b972de7f756def20afcdcb2ecbb6e
author Yuexi Ma <yuexima@google.com> Wed Dec 21 21:23:52 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Dec 21 21:23:52 2016 +0000
tree 605716ca2e8e9c363f5d306a892236ef35495a09
parent 8df2d8250fb5b906c25fb191ac3fb928ea46c589
parent 5be95b1cd5ddf680d59d414a3af4504a20586b80

fix build warning for fugu and other devices with single arc am: a1bb8e91bd am: 5570cf866d
am: 5be95b1cd5

Change-Id: I0b6d886c4ad1379eabbb92a499a9c1c236b521b8

android/Android.mk

diff --git a/android/Android.mk b/android/Android.mk
index 6dde90d..56118eb 100644
--- a/android/Android.mk
+++ b/android/Android.mk
@@ -12,6 +12,7 @@
 #
 
 disabled_target := 0
+target_support_64bit := 0
 
 # TODO: enable LTP for darwin and windows hosts
 ifneq (linux, $(HOST_OS))
@@ -31,6 +32,15 @@
 endif
 
 
+ifneq (,$(findstring 64, $(TARGET_ARCH)))
+target_support_64bit := 1
+endif
+
+ifneq (,$(findstring 64, $(TARGET_2ND_ARCH)))
+target_support_64bit := 1
+endif
+
+
 ifeq (0, $(disabled_target))
 
 LOCAL_PATH := $(call my-dir)

android/Android.prebuilt.mk

diff --git a/android/Android.prebuilt.mk b/android/Android.prebuilt.mk
index 7d2f784..e76b60c 100644
--- a/android/Android.prebuilt.mk
+++ b/android/Android.prebuilt.mk
@@ -32,6 +32,7 @@
 vts_src_file_32 := $(LOCAL_MODULE_PATH)/$(LOCAL_INSTALLED_MODULE_STEM)
 vts_dst_file_32 := $(module_path)/$(module_stem)
 
+ifeq (1, $(target_support_64bit))
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := $(module_name)-64
@@ -48,6 +49,7 @@
 vts_dst_file_64 := $(module_path)/$(module_stem)
 
 include $(LOCAL_PATH)/Android.vts_testcase.mk
+endif
 
 module_name :=
 module_stem :=

android/Android.test.mk

diff --git a/android/Android.test.mk b/android/Android.test.mk
index 1ce022f..63770b7 100644
--- a/android/Android.test.mk
+++ b/android/Android.test.mk
@@ -18,11 +18,13 @@
 
 LOCAL_MODULE := $(module_name)
 LOCAL_MODULE_STEM_32 := $(module_stem)
-LOCAL_MODULE_STEM_64 := $(module_stem)
 LOCAL_MODULE_PATH_32 := $($(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_DATA_NATIVE_TESTS)/ltp/testcases/bin
+ifeq (1, $(target_support_64bit))
+LOCAL_MODULE_STEM_64 := $(module_stem)
 LOCAL_MODULE_PATH_64 := $(TARGET_OUT_DATA_NATIVE_TESTS)/ltp/testcases/bin
+endif
 LOCAL_MODULE_TAGS := optional
-LOCAL_MULTILIB := both
+LOCAL_MULTILIB :=
 
 LOCAL_CFLAGS := $(ltp_cflags) $(module_cflags)
 LOCAL_CFLAGS_arm := $(ltp_cflags_arm)

android/Android.vts_testcase.mk

diff --git a/android/Android.vts_testcase.mk b/android/Android.vts_testcase.mk
index 3a8999f..b4065e0 100644
--- a/android/Android.vts_testcase.mk
+++ b/android/Android.vts_testcase.mk
@@ -28,6 +28,7 @@
 
 endif
 
+ifeq (1, $(target_support_64bit))
 ifdef vts_src_file_64
 
 vts_testcases_out_64 := $(VTS_TESTCASES_OUT)/64/ltp
@@ -39,3 +40,4 @@
 vts: $(vts_testcase_dst_file_64)
 
 endif
+endif