Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Convert java hwbinder mk -> bp." am: 53c945fb71

Browse Source 
am: 7bebf15460

Change-Id: Ia799ca49151cdb20b6327d814f65822b46d8fb45
This commit is contained in:
Steven Moreland
2017-10-04 04:20:08 +00:00
committed by android-build-merger
parent 3674a64029 7bebf15460
commit e215488334
2 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Android.bp
View File

@@ -63,3 +63,25 @@ subdirs = [
optional_subdirs = [ optional_subdirs = [
"core/tests/utiltests/jni", "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,
}

26
Android.mk
View File

@@ -633,32 +633,6 @@ $(framework_module): | $(dir $(framework_module))framework-res.apk
framework_built := $(call java-lib-deps,framework) 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, # Copy AIDL files to be preprocessed and included in the SDK,
# specified relative to the root of the build tree. # specified relative to the root of the build tree.
# ============================================================ # ============================================================