diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2017-09-09 13:37:03 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2017-09-09 13:47:34 -0700 |
| commit | c0a0f2dc1f4d094094fcb26d4699457cf208d095 (patch) | |
| tree | 15f00ba8efd79d5f24250caf06a62487e05c93a9 /tools/zipalign | |
| parent | 28e18624113f112d1ee36504fb91ef6c6b5d2ff5 (diff) | |
| download | platform_build-c0a0f2dc1f4d094094fcb26d4699457cf208d095.tar.gz platform_build-c0a0f2dc1f4d094094fcb26d4699457cf208d095.tar.bz2 platform_build-c0a0f2dc1f4d094094fcb26d4699457cf208d095.zip | |
Convert to Android.bp
Test: m atree fs_config fs_config_generate_test fs_config-unit-tests fs_get_stats zipalign
Test: cd out/host/linux-x86/nativetest64/fs_config-unit-tests ./fs_config-unit-tests
Change-Id: I3c5403a7f1cf221715eb52a41c640af9afcee175
Diffstat (limited to 'tools/zipalign')
| -rw-r--r-- | tools/zipalign/Android.bp | 31 | ||||
| -rw-r--r-- | tools/zipalign/Android.mk | 38 |
2 files changed, 31 insertions, 38 deletions
diff --git a/tools/zipalign/Android.bp b/tools/zipalign/Android.bp new file mode 100644 index 0000000000..cfc6aecdf0 --- /dev/null +++ b/tools/zipalign/Android.bp @@ -0,0 +1,31 @@ +// +// Copyright 2008 The Android Open Source Project +// +// Zip alignment tool +// + +cc_binary_host { + name: "zipalign", + + srcs: [ + "ZipAlign.cpp", + "ZipEntry.cpp", + "ZipFile.cpp", + ], + + static_libs: [ + "libandroidfw", + "libutils", + "libcutils", + "liblog", + "libzopfli", + "libz", + ], + + target: { + windows: { + host_ldlibs: ["-lpthread"], + enabled: true, + }, + }, +} diff --git a/tools/zipalign/Android.mk b/tools/zipalign/Android.mk deleted file mode 100644 index 8c0240a27c..0000000000 --- a/tools/zipalign/Android.mk +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright 2008 The Android Open Source Project -# -# Zip alignment tool -# - -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - ZipAlign.cpp \ - ZipEntry.cpp \ - ZipFile.cpp - -LOCAL_C_INCLUDES += external/zlib \ - external/zopfli/src - -LOCAL_STATIC_LIBRARIES := \ - libandroidfw \ - libutils \ - libcutils \ - liblog \ - libzopfli - -LOCAL_LDLIBS_linux += -lrt - -LOCAL_STATIC_LIBRARIES_windows += libz -LOCAL_LDLIBS_linux += -lz -LOCAL_LDLIBS_darwin += -lz - -ifneq ($(strip $(BUILD_HOST_static)),) -LOCAL_LDLIBS += -lpthread -endif # BUILD_HOST_static - -LOCAL_MODULE := zipalign -LOCAL_MODULE_HOST_OS := darwin linux windows - -include $(BUILD_HOST_EXECUTABLE) |