diff options
| author | Yuexi Ma <yuexima@google.com> | 2016-12-21 21:23:42 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-12-21 21:23:42 +0000 |
| commit | 8df2d8250fb5b906c25fb191ac3fb928ea46c589 (patch) | |
| tree | 5fe9143f1549332d68f3f2b9e9bd69ed8f40378f | |
| parent | 5eca35a0f3026c8dcadfc3174610e7a31a8c2a90 (diff) | |
| parent | 6f6d6993a671982b853e20327131300934852b92 (diff) | |
| download | ltp-8df2d8250fb5b906c25fb191ac3fb928ea46c589.tar.gz | |
fix build warning by force unique cc_target basename am: 5e548d93dd am: 85006b084e
am: 6f6d6993a6
Change-Id: Iaf3b2433fddbef83b39309b4b46424922a0ade40
| -rw-r--r-- | android/Android.ltp.mk | 8 | ||||
| -rw-r--r-- | android/tools/android_mk_generator.py | 17 |
2 files changed, 13 insertions, 12 deletions
diff --git a/android/Android.ltp.mk b/android/Android.ltp.mk index f5636d058..a88ee6baf 100644 --- a/android/Android.ltp.mk +++ b/android/Android.ltp.mk @@ -7685,14 +7685,6 @@ module_static_libraries := ltp module_shared_libraries := include $(ltp_build_test) -module_testname := lib/tests/tst_checkpoint -module_src_files := lib/tests/tst_checkpoint.c -module_cflags := -module_c_includes := include include/old -module_static_libraries := ltp -module_shared_libraries := -include $(ltp_build_test) - module_testname := testcases/kernel/syscalls/wait/wait02 module_src_files := testcases/kernel/syscalls/wait/wait02.c module_cflags := diff --git a/android/tools/android_mk_generator.py b/android/tools/android_mk_generator.py index 163376b01..2e103359c 100644 --- a/android/tools/android_mk_generator.py +++ b/android/tools/android_mk_generator.py @@ -84,7 +84,7 @@ class AndroidMkGenerator(object): def BuildExecutable(self, cc_target, local_src_files, local_cflags, local_c_includes, local_libraries, ltp_libs, - ltp_libs_used): + ltp_libs_used, ltp_names_used): '''Build a test module. Args: @@ -94,8 +94,16 @@ class AndroidMkGenerator(object): local_c_includes: list of string local_libraries: list of string ltp_libs: list of string - ltp_libs_used: list of string + ltp_libs_used: set of string + ltp_names_used: set of string, set of already used cc_target basenames ''' + base_name = os.path.basename(cc_target) + if base_name in ltp_names_used: + print 'ERROR: base name {} of cc_target {} already used. Skipping...'.format( + base_name, cc_target) + return + ltp_names_used.add(base_name) + self.result.append('module_testname := %s' % cc_target) self.result.append('module_src_files := %s' % ' '.join(local_src_files)) @@ -209,6 +217,7 @@ class AndroidMkGenerator(object): ltp_libs = set(self.ArTargetToLibraryName(i) for i in ar.keys()) # All libraries used by the LTP tests we actually build ltp_libs_used = set() + ltp_names_used = set() print( "Disabled lib tests: Test cases listed here are" @@ -243,7 +252,7 @@ class AndroidMkGenerator(object): continue self.BuildExecutable(target, local_src_files, local_cflags, local_c_includes, local_libraries, ltp_libs, - ltp_libs_used) + ltp_libs_used, ltp_names_used) for target in cc_link: if os.path.basename(target) in disabled_tests: @@ -270,7 +279,7 @@ class AndroidMkGenerator(object): self.BuildExecutable(target, local_src_files, local_cflags, local_c_includes, local_libraries, ltp_libs, - ltp_libs_used) + ltp_libs_used, ltp_names_used) for target in ar: # Disabled ltp library is already excluded |