diff options
author | Steve Muckle <smuckle@google.com> | 2017-10-15 05:13:36 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-10-15 05:13:36 +0000 |
commit | b48d5ddc7b24b693f92d1d10275151544a22578e (patch) | |
tree | 1b48c9b714d53c677468690edcdaa5939faab4d9 | |
parent | 2a71444bf7d58374654060dc3f205611a0a2efc3 (diff) | |
parent | 9268914ae163fbb60c63ab16aba6906c9c92e35c (diff) | |
download | libcap-ng-b48d5ddc7b24b693f92d1d10275151544a22578e.tar.gz |
Merge "convert to Soong, static library" am: 168a87ba95 am: 7ee71735df am: e1c4f45c70android-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-p-preview-3android-p-preview-2android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-devmaster-cuttlefish-testing-release
am: 9268914ae1
Change-Id: I0f0e723c251a6ff175edf8f93c6dc660ab5e4a5e
-rw-r--r-- | Android.bp | 16 | ||||
-rw-r--r-- | Android.mk | 25 |
2 files changed, 16 insertions, 25 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..65d50aa --- /dev/null +++ b/Android.bp @@ -0,0 +1,16 @@ +cc_library_static { + + srcs: [ + "libcap-ng-0.7/src/cap-ng.c", + "libcap-ng-0.7/src/lookup_table.c", + ], + + export_include_dirs: ["libcap-ng-0.7/src"], + name: "libcap-ng", + cflags: [ + "-Wall", + "-Werror", + "-Wno-enum-conversion", + "-Wno-unused-parameter", + ], +} diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 0c298b6..0000000 --- a/Android.mk +++ /dev/null @@ -1,25 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - libcap-ng-0.7/src/cap-ng.c \ - libcap-ng-0.7/src/lookup_table.c - -LOCAL_C_INCLUDES += $(LOCAL_PATH)/libcap-ng-0.7/src -LOCAL_MODULE := libcap-ng -LOCAL_CFLAGS := \ - -Wall -Werror \ - -Wno-enum-conversion \ - -Wno-unused-parameter -include $(BUILD_SHARED_LIBRARY) - -###################### - -include $(CLEAR_VARS) -LOCAL_SRC_FILES := libcap-ng-0.7/utils/pscap.c -LOCAL_C_INCLUDES += $(LOCAL_PATH)/libcap-ng-0.7/src -LOCAL_SHARED_LIBRARIES += libcap-ng -LOCAL_MODULE := pscap -LOCAL_CFLAGS := -Wall -Werror -include $(BUILD_EXECUTABLE) |