diff options
Diffstat (limited to 'libs/androidfw/Android.mk')
| -rw-r--r-- | libs/androidfw/Android.mk | 65 |
1 files changed, 22 insertions, 43 deletions
diff --git a/libs/androidfw/Android.mk b/libs/androidfw/Android.mk index 3ed75a2..d80612b 100644 --- a/libs/androidfw/Android.mk +++ b/libs/androidfw/Android.mk @@ -14,47 +14,47 @@ LOCAL_PATH:= $(call my-dir) -# libandroidfw is partially built for the host (used by build time keymap validation tool) +# libandroidfw is partially built for the host (used by obbtool and others) # These files are common to host and target builds. -# formerly in libutils -commonUtilsSources:= \ +commonSources := \ Asset.cpp \ AssetDir.cpp \ AssetManager.cpp \ + misc.cpp \ ObbFile.cpp \ ResourceTypes.cpp \ - StreamingZipInflater.cpp - -# formerly in libui -commonUiSources:= \ - Input.cpp \ - InputDevice.cpp \ - Keyboard.cpp \ - KeyCharacterMap.cpp \ - KeyLayoutMap.cpp \ - VelocityControl.cpp \ - VelocityTracker.cpp \ - VirtualKeyMap.cpp - -commonSources:= \ - $(commonUtilsSources) \ - $(commonUiSources) + StreamingZipInflater.cpp \ + ZipFileRO.cpp \ + ZipUtils.cpp + +deviceSources := \ + $(commonSources) \ + BackupData.cpp \ + BackupHelpers.cpp \ + CursorWindow.cpp + +hostSources := \ + $(commonSources) # For the host # ===================================================== include $(CLEAR_VARS) -LOCAL_SRC_FILES:= $(commonSources) +LOCAL_SRC_FILES:= $(hostSources) LOCAL_MODULE:= libandroidfw LOCAL_MODULE_TAGS := optional +LOCAL_CFLAGS += -DSTATIC_ANDROIDFW_FOR_TOOLS + LOCAL_C_INCLUDES := \ external/zlib +LOCAL_STATIC_LIBRARIES := liblog + include $(BUILD_HOST_STATIC_LIBRARY) @@ -63,23 +63,16 @@ include $(BUILD_HOST_STATIC_LIBRARY) include $(CLEAR_VARS) -LOCAL_SRC_FILES:= \ - $(commonSources) \ - BackupData.cpp \ - BackupHelpers.cpp \ - CursorWindow.cpp \ - InputTransport.cpp +LOCAL_SRC_FILES:= $(deviceSources) LOCAL_SHARED_LIBRARIES := \ + libbinder \ liblog \ libcutils \ libutils \ - libbinder \ - libskia \ libz LOCAL_C_INCLUDES := \ - external/skia/include/core \ external/icu4c/common \ external/zlib @@ -90,20 +83,6 @@ LOCAL_MODULE_TAGS := optional include $(BUILD_SHARED_LIBRARY) -ifeq ($(TARGET_OS),linux) -include $(CLEAR_VARS) -LOCAL_C_INCLUDES += \ - external/skia/include/core \ - external/zlib \ - external/icu4c/common \ - bionic/libc/private -LOCAL_LDLIBS := -lrt -ldl -lpthread -LOCAL_MODULE := libandroidfw -LOCAL_SRC_FILES := $(commonUtilsSources) BackupData.cpp BackupHelpers.cpp -include $(BUILD_STATIC_LIBRARY) -endif - - # Include subdirectory makefiles # ============================================================ |