Revert "Revert "[incremental] change build rules to not to use aidl_interface""
This reverts commit 8d1235b882dde3eb055a652185a0f0f31e176211.
Reason for revert: trying again
Test: forest
BUG: 181266844
Change-Id: I57652132fda01a8a7964a1338b7f31a208df8094
Change-Id: I71a93fcba3463b143d9b6e055587ce36b35889af
diff --git a/Android.bp b/Android.bp
index 9374c01..72fc103 100644
--- a/Android.bp
+++ b/Android.bp
@@ -344,8 +344,8 @@
genrule {
name: "statslog-telephony-common-java-gen",
tools: ["stats-log-api-gen"],
- cmd: "$(location stats-log-api-gen) --java $(out) --module telephony_common"
- + " --javaPackage com.android.internal.telephony --javaClass TelephonyCommonStatsLog",
+ cmd: "$(location stats-log-api-gen) --java $(out) --module telephony_common" +
+ " --javaPackage com.android.internal.telephony --javaClass TelephonyCommonStatsLog",
out: ["com/android/internal/telephony/TelephonyCommonStatsLog.java"],
}
@@ -752,8 +752,8 @@
}
platform_compat_config {
- name: "framework-platform-compat-config",
- src: ":framework-minus-apex",
+ name: "framework-platform-compat-config",
+ src: ":framework-minus-apex",
}
// A temporary build target that is conditionally included on the bootclasspath if
@@ -774,7 +774,7 @@
name: "statslog-framework-java-gen",
tools: ["stats-log-api-gen"],
cmd: "$(location stats-log-api-gen) --java $(out) --module framework" +
- " --javaPackage com.android.internal.util --javaClass FrameworkStatsLog --worksource",
+ " --javaPackage com.android.internal.util --javaClass FrameworkStatsLog --worksource",
out: ["com/android/internal/util/FrameworkStatsLog.java"],
}
@@ -883,7 +883,7 @@
java_library {
name: "framework-annotations-lib",
- srcs: [ ":framework-annotations" ],
+ srcs: [":framework-annotations"],
sdk_version: "core_current",
}
@@ -1161,7 +1161,6 @@
},
}
-
// This is the full proto version of libplatformprotos. It may only
// be used by test code that is not shipped on the device.
cc_library {
@@ -1227,68 +1226,57 @@
path: "core/java",
}
-aidl_interface {
- name: "libincremental_aidl",
- unstable: true,
+cc_defaults {
+ name: "incremental_default",
+ cflags: [
+ "-Wall",
+ "-Wextra",
+ "-Wextra-semi",
+ "-Werror",
+ "-Wzero-as-null-pointer-constant",
+ "-DANDROID_BASE_UNIQUE_FD_DISABLE_IMPLICIT_CONVERSION",
+ ],
+ shared_libs: [
+ "libbinder",
+ "libutils",
+ ],
+ aidl: {
+ include_dirs: [
+ "frameworks/native/aidl/binder",
+ ],
+ export_aidl_headers: true,
+ },
+}
+
+cc_library {
+ name: "libincremental_aidl-cpp",
srcs: [
":incremental_aidl",
],
- backend: {
- java: {
- sdk_version: "28",
- },
- cpp: {
- enabled: true,
- },
- ndk: {
- enabled: true,
- },
- },
+ defaults: ["incremental_default"],
}
-aidl_interface {
- name: "libdataloader_aidl",
- unstable: true,
+cc_library {
+ name: "libdataloader_aidl-cpp",
srcs: [
":dataloader_aidl",
],
- imports: [
- "libincremental_aidl",
+ defaults: ["incremental_default"],
+ shared_libs: [
+ "libincremental_aidl-cpp",
],
- backend: {
- java: {
- sdk_version: "28",
- },
- cpp: {
- enabled: true,
- },
- ndk: {
- enabled: false,
- },
- },
}
-aidl_interface {
- name: "libincremental_manager_aidl",
- unstable: true,
+cc_library {
+ name: "libincremental_manager_aidl-cpp",
srcs: [
":incremental_manager_aidl",
],
- imports: [
- "libincremental_aidl",
- "libdataloader_aidl",
+ defaults: ["incremental_default"],
+ shared_libs: [
+ "libincremental_aidl-cpp",
+ "libdataloader_aidl-cpp",
],
- backend: {
- java: {
- sdk_version: "28",
- },
- cpp: {
- enabled: true,
- },
- ndk: {
- enabled: false,
- },
- },
}
// TODO(b/77285514): remove this once the last few hidl interfaces have been
@@ -1317,7 +1305,7 @@
"core/java/android/os/RemoteException.java",
"core/java/android/util/AndroidException.java",
],
- libs: [ "unsupportedappusage" ],
+ libs: ["unsupportedappusage"],
dxflags: ["--core-library"],
installable: false,
@@ -1536,4 +1524,5 @@
":protolog-common-src",
],
}
+
// protolog end