diff options
| author | Colin Cross <ccross@android.com> | 2016-12-02 16:32:11 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-12-02 16:32:11 +0000 |
| commit | c4d5a93de2816abac87e75ffdd2a9eec7a26293a (patch) | |
| tree | 2e31706f43faa77767e0888d58b4bf732ca64490 | |
| parent | ba003b8b3103df7ed033e60dd755ad092b411673 (diff) | |
| parent | 4a1f07c5656d84260232f2d04e4a39755c8b32cd (diff) | |
| download | piex-c4d5a93de2816abac87e75ffdd2a9eec7a26293a.tar.gz | |
Convert libpiex to Android.bp am: cdd77ccc7b am: 9d9a85fabc
am: 4a1f07c565
Change-Id: Ia830765a1780f52a437c42c7e3855dbd51a942dd
| -rw-r--r-- | Android.bp | 40 | ||||
| -rw-r--r-- | Android.mk | 45 |
2 files changed, 40 insertions, 45 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..8e7ec9e --- /dev/null +++ b/Android.bp @@ -0,0 +1,40 @@ +cc_library_static { + name: "libbinary_parse", + srcs: [ + "src/binary_parse/cached_paged_byte_array.cc", + "src/binary_parse/range_checked_byte_ptr.cc", + ], + cppflags: ["-Wsign-compare"], +} + +cc_library_static { + name: "libimage_type_recognition", + srcs: [ + "src/image_type_recognition/image_type_recognition_lite.cc", + ], + static_libs: ["libbinary_parse"], + cppflags: ["-Wsign-compare"], +} + +cc_library_static { + name: "libtiff_directory", + srcs: [ + "src/tiff_directory/tiff_directory.cc", + ], + static_libs: ["libbinary_parse"], + cppflags: ["-Wsign-compare"], +} + +cc_library_shared { + name: "libpiex", + srcs: [ + "src/tiff_parser.cc", + "src/piex.cc", + ], + static_libs: [ + "libbinary_parse", + "libimage_type_recognition", + "libtiff_directory", + ], + cppflags: ["-Wsign-compare"], +} diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 277b17f..0000000 --- a/Android.mk +++ /dev/null @@ -1,45 +0,0 @@ -LOCAL_PATH := $(my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := libbinary_parse -LOCAL_CPP_EXTENSION := .cc -LOCAL_SRC_FILES:= \ - src/binary_parse/cached_paged_byte_array.cc \ - src/binary_parse/range_checked_byte_ptr.cc -LOCAL_CPPFALGS := -Wsign-compare -include $(BUILD_SHARED_LIBRARY) - -include $(CLEAR_VARS) - -LOCAL_MODULE := libimage_type_recognition -LOCAL_CPP_EXTENSION := .cc -LOCAL_SRC_FILES:= \ - src/image_type_recognition/image_type_recognition_lite.cc -LOCAL_SHARED_LIBRARIES := libbinary_parse -LOCAL_CPPFALGS := -Wsign-compare -include $(BUILD_SHARED_LIBRARY) - -include $(CLEAR_VARS) - -LOCAL_MODULE := libtiff_directory -LOCAL_CPP_EXTENSION := .cc -LOCAL_SRC_FILES:= \ - src/tiff_directory/tiff_directory.cc -LOCAL_SHARED_LIBRARIES := libbinary_parse -LOCAL_CPPFALGS := -Wsign-compare -include $(BUILD_SHARED_LIBRARY) - -include $(CLEAR_VARS) - -LOCAL_MODULE := libpiex -LOCAL_CPP_EXTENSION := .cc -LOCAL_SRC_FILES:= \ - src/tiff_parser.cc \ - src/piex.cc -LOCAL_SHARED_LIBRARIES := \ - libbinary_parse \ - libimage_type_recognition \ - libtiff_directory -LOCAL_CPPFALGS := -Wsign-compare -include $(BUILD_SHARED_LIBRARY) |