diff options
| author | 2017-10-04 04:39:30 +0000 | |
|---|---|---|
| committer | 2017-10-04 04:39:30 +0000 | |
| commit | 862fed56a132946019dc6e9075fc789f0708bb02 (patch) | |
| tree | 50facc39711bcb94b69c530694e3e5b82d185982 | |
| parent | 498ecb9a07f761b7d9040caf503d0326360db85f (diff) | |
| parent | ae1d9692e18dadcc5c304538ef3160334ec4c04d (diff) | |
Merge "Convert java hwbinder mk -> bp." am: 53c945fb71 am: 7bebf15460 am: e215488334
am: ae1d9692e1
Change-Id: Ice41676c739aa9df308cf68dab652913195307d5
| -rw-r--r-- | Android.bp | 22 | ||||
| -rw-r--r-- | Android.mk | 26 |
2 files changed, 22 insertions, 26 deletions
diff --git a/Android.bp b/Android.bp index 43fb48a089f3..80f1c375f7f7 100644 --- a/Android.bp +++ b/Android.bp @@ -65,3 +65,25 @@ subdirs = [ optional_subdirs = [ "core/tests/utiltests/jni", ] + +java_library { + name: "hwbinder", + no_framework_libs: true, + + srcs: [ + "core/java/android/os/HidlSupport.java", + "core/java/android/annotation/NonNull.java", + "core/java/android/os/HwBinder.java", + "core/java/android/os/HwBlob.java", + "core/java/android/os/HwParcel.java", + "core/java/android/os/IHwBinder.java", + "core/java/android/os/IHwInterface.java", + "core/java/android/os/DeadObjectException.java", + "core/java/android/os/DeadSystemException.java", + "core/java/android/os/RemoteException.java", + "core/java/android/util/AndroidException.java", + ], + + dxflags: ["--core-library"], + installable: false, +} diff --git a/Android.mk b/Android.mk index 7d31fdc662b2..98e4299f40be 100644 --- a/Android.mk +++ b/Android.mk @@ -652,32 +652,6 @@ $(framework_module): | $(dir $(framework_module))framework-res.apk framework_built := $(call java-lib-deps,framework) -# HwBinder -# ======================================================= -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - core/java/android/os/HidlSupport.java \ - core/java/android/annotation/NonNull.java \ - core/java/android/os/HwBinder.java \ - core/java/android/os/HwBlob.java \ - core/java/android/os/HwParcel.java \ - core/java/android/os/IHwBinder.java \ - core/java/android/os/IHwInterface.java \ - core/java/android/os/DeadObjectException.java \ - core/java/android/os/DeadSystemException.java \ - core/java/android/os/RemoteException.java \ - core/java/android/util/AndroidException.java \ - -LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES := core-oj core-libart -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE := hwbinder - -LOCAL_DX_FLAGS := --core-library -LOCAL_UNINSTALLABLE_MODULE := true -include $(BUILD_JAVA_LIBRARY) - # Copy AIDL files to be preprocessed and included in the SDK, # specified relative to the root of the build tree. # ============================================================ |