Revert "[incremental] change build rules to not to use aidl_interface"
This reverts commit e2c109d7e49e18a3ca503b60fbdf0a1959f468f9.
Reason for revert: This breaks sdk_mac target of git_master-without-vendor
Bug: 181646945
Change-Id: I19d957113d1c80a88e5fba917b344c69b64a2c94
diff --git a/Android.bp b/Android.bp
index 14b5b30..908280e 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"],
}
@@ -749,8 +749,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
@@ -771,7 +771,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"],
}
@@ -880,7 +880,7 @@
java_library {
name: "framework-annotations-lib",
- srcs: [":framework-annotations"],
+ srcs: [ ":framework-annotations" ],
sdk_version: "core_current",
}
@@ -1158,6 +1158,7 @@
},
}
+
// 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 {
@@ -1223,58 +1224,68 @@
path: "core/java",
}
-cc_defaults {
- name: "incremental_default",
- host_supported: true,
- 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",
+aidl_interface {
+ name: "libincremental_aidl",
+ unstable: true,
srcs: [
":incremental_aidl",
],
- defaults: ["incremental_default"],
+ backend: {
+ java: {
+ sdk_version: "28",
+ },
+ cpp: {
+ enabled: true,
+ },
+ ndk: {
+ enabled: true,
+ },
+ },
}
-cc_library {
- name: "libdataloader_aidl-cpp",
+aidl_interface {
+ name: "libdataloader_aidl",
+ unstable: true,
srcs: [
":dataloader_aidl",
],
- defaults: ["incremental_default"],
- shared_libs: [
- "libincremental_aidl-cpp",
+ imports: [
+ "libincremental_aidl",
],
+ backend: {
+ java: {
+ sdk_version: "28",
+ },
+ cpp: {
+ enabled: true,
+ },
+ ndk: {
+ enabled: false,
+ },
+ },
}
-cc_library {
- name: "libincremental_manager_aidl-cpp",
+aidl_interface {
+ name: "libincremental_manager_aidl",
+ unstable: true,
srcs: [
":incremental_manager_aidl",
],
- defaults: ["incremental_default"],
- shared_libs: [
- "libincremental_aidl-cpp",
- "libdataloader_aidl-cpp",
+ imports: [
+ "libincremental_aidl",
+ "libdataloader_aidl",
],
+ backend: {
+ java: {
+ sdk_version: "28",
+ },
+ cpp: {
+ enabled: true,
+ },
+ ndk: {
+ enabled: false,
+ },
+ },
}
// TODO(b/77285514): remove this once the last few hidl interfaces have been
@@ -1303,7 +1314,7 @@
"core/java/android/os/RemoteException.java",
"core/java/android/util/AndroidException.java",
],
- libs: ["unsupportedappusage"],
+ libs: [ "unsupportedappusage" ],
dxflags: ["--core-library"],
installable: false,
@@ -1522,5 +1533,4 @@
":protolog-common-src",
],
}
-
// protolog end