diff options
| author | Jeff Brown <jeffbrown@google.com> | 2013-07-01 19:07:15 -0700 |
|---|---|---|
| committer | Jeff Brown <jeffbrown@google.com> | 2013-07-01 20:11:42 -0700 |
| commit | 9d3b1a424c5c61e24e9659d15fb353026a00d925 (patch) | |
| tree | 0e543391e3ac7b6ac0bff377e08cd2e233ef7363 /tools/aapt | |
| parent | 8f5e3d13e166e4873e130a5ef7c987333dbac917 (diff) | |
| download | frameworks_base-9d3b1a424c5c61e24e9659d15fb353026a00d925.zip frameworks_base-9d3b1a424c5c61e24e9659d15fb353026a00d925.tar.gz frameworks_base-9d3b1a424c5c61e24e9659d15fb353026a00d925.tar.bz2 | |
Move input library code to frameworks/native.
No longer compile libandroidfw as a static library on the device
since it already exists as a shared library. Keeping the static
library would force us to provide a static library version of
libinput for the device as well which doesn't make sense.
Change-Id: I3517881b87b47dcc209d80dbd0ac6b5cf29a766f
Diffstat (limited to 'tools/aapt')
| -rw-r--r-- | tools/aapt/Android.mk | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/tools/aapt/Android.mk b/tools/aapt/Android.mk index 3b49819..452c60a 100644 --- a/tools/aapt/Android.mk +++ b/tools/aapt/Android.mk @@ -83,20 +83,19 @@ LOCAL_C_INCLUDES += external/stlport/stlport LOCAL_C_INCLUDES += external/libpng LOCAL_C_INCLUDES += external/zlib -LOCAL_CFLAGS += -DSTATIC_ANDROIDFW_FOR_TOOLS LOCAL_CFLAGS += -Wno-non-virtual-dtor LOCAL_SHARED_LIBRARIES := \ + libandroidfw \ + libutils \ + libcutils \ libpng \ + liblog \ libz LOCAL_STATIC_LIBRARIES := \ libstlport_static \ - libandroidfw \ - libutils \ - libcutils \ - libexpat_static \ - liblog + libexpat_static include $(BUILD_EXECUTABLE) endif |