diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2014-11-03 18:03:53 -0800 |
|---|---|---|
| committer | Adam Lesinski <adamlesinski@google.com> | 2014-11-03 18:06:22 -0800 |
| commit | 3fd340028fc24198edb23ddf5eb5a0a100bab745 (patch) | |
| tree | 489ffeed9998280d7402b74ed78bcc61d6cd8872 /libs/androidfw/tests | |
| parent | 7fd12db350a341eb7a50759aa329be5281556928 (diff) | |
| parent | 78be0498af2b7d5b6855701ef316f488e2de6f14 (diff) | |
| download | frameworks_base-3fd340028fc24198edb23ddf5eb5a0a100bab745.zip frameworks_base-3fd340028fc24198edb23ddf5eb5a0a100bab745.tar.gz frameworks_base-3fd340028fc24198edb23ddf5eb5a0a100bab745.tar.bz2 | |
Merge commit '78be0498' into manualmerge
Conflicts:
libs/androidfw/ResourceTypes.cpp
tools/aapt/Android.mk
tools/aapt/StringPool.cpp
tools/aapt/StringPool.h
Change-Id: I9d69efdfb892032895ace12159d193304f02dc6c
Diffstat (limited to 'libs/androidfw/tests')
| -rw-r--r-- | libs/androidfw/tests/Android.mk | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libs/androidfw/tests/Android.mk b/libs/androidfw/tests/Android.mk index a0442e4..d802a6b 100644 --- a/libs/androidfw/tests/Android.mk +++ b/libs/androidfw/tests/Android.mk @@ -37,7 +37,6 @@ testFiles := \ include $(CLEAR_VARS) LOCAL_MODULE := libandroidfw_tests - LOCAL_SRC_FILES := $(testFiles) LOCAL_STATIC_LIBRARIES := \ libandroidfw \ @@ -55,11 +54,9 @@ ifneq ($(SDK_ONLY),true) include $(CLEAR_VARS) LOCAL_MODULE := libandroidfw_tests - LOCAL_SRC_FILES := $(testFiles) \ BackupData_test.cpp \ ObbFile_test.cpp - LOCAL_SHARED_LIBRARIES := \ libandroidfw \ libcutils \ |