diff options
| author | Steven Moreland <smoreland@google.com> | 2017-11-06 18:10:11 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-11-06 18:10:11 +0000 |
| commit | d292895d0dcacabaa5d2454af3d9f4c19f54d445 (patch) | |
| tree | a18daa225c64585b5a15636131cc5a0f1275a337 /dumpstate | |
| parent | d29bc78ec900baf718bf12385995c0549d38b778 (diff) | |
| parent | 9251e7174034910825e821dd6fd43fd047babb87 (diff) | |
Merge "dumpstate mk -> bp" am: b1088c6de1
am: 9251e71740
Change-Id: I4cdfb67a299ca6ab601306e1ef83d099eabbd8f8
Diffstat (limited to 'dumpstate')
| -rw-r--r-- | dumpstate/1.0/default/Android.bp | 22 | ||||
| -rw-r--r-- | dumpstate/1.0/default/Android.mk | 22 | ||||
| -rw-r--r-- | dumpstate/Android.bp | 1 |
3 files changed, 23 insertions, 22 deletions
diff --git a/dumpstate/1.0/default/Android.bp b/dumpstate/1.0/default/Android.bp new file mode 100644 index 0000000000..41ccd592c0 --- /dev/null +++ b/dumpstate/1.0/default/Android.bp @@ -0,0 +1,22 @@ +cc_binary { + name: "android.hardware.dumpstate@1.0-service", + init_rc: ["android.hardware.dumpstate@1.0-service.rc"], + relative_install_path: "hw", + vendor: true, + srcs: [ + "DumpstateDevice.cpp", + "service.cpp", + ], + + shared_libs: [ + "android.hardware.dumpstate@1.0", + "libbase", + "libcutils", + "libdumpstateutil", + "libhidlbase", + "libhidltransport", + "liblog", + "libutils", + ], + +} diff --git a/dumpstate/1.0/default/Android.mk b/dumpstate/1.0/default/Android.mk deleted file mode 100644 index 0b07f493d0..0000000000 --- a/dumpstate/1.0/default/Android.mk +++ /dev/null @@ -1,22 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.dumpstate@1.0-service -LOCAL_INIT_RC := android.hardware.dumpstate@1.0-service.rc -LOCAL_MODULE_RELATIVE_PATH := hw -LOCAL_PROPRIETARY_MODULE := true -LOCAL_SRC_FILES := \ - DumpstateDevice.cpp \ - service.cpp - -LOCAL_SHARED_LIBRARIES := \ - android.hardware.dumpstate@1.0 \ - libbase \ - libcutils \ - libdumpstateutil \ - libhidlbase \ - libhidltransport \ - liblog \ - libutils - -include $(BUILD_EXECUTABLE) diff --git a/dumpstate/Android.bp b/dumpstate/Android.bp index 33f70ebae2..ed19a37034 100644 --- a/dumpstate/Android.bp +++ b/dumpstate/Android.bp @@ -1,5 +1,6 @@ // This is an autogenerated file, do not edit. subdirs = [ "1.0", + "1.0/default", "1.0/vts/functional", ] |