aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com>2024-05-15 07:20:45 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2024-05-15 07:20:45 +0000
commit4a2c1b5ca3c049768ebaf8865245d9342b431870 (patch)
tree2f1238ae33c79d3898f7d618479f08c093c1e093
parent3e94ffd0ed606677edb7558388bb1491b0a80843 (diff)
parent5529e36e88f8320d1f7fcab533ec3dd668b92c27 (diff)
downloadbuild-master.tar.gz
Merge "Add a nano proto version of aconfig protos" into mainHEADmastermain
-rw-r--r--tools/aconfig/aconfig_protos/Android.bp19
-rw-r--r--tools/aconfig/aconfig_protos/jarjar-nano-rules.txt1
2 files changed, 18 insertions, 2 deletions
diff --git a/tools/aconfig/aconfig_protos/Android.bp b/tools/aconfig/aconfig_protos/Android.bp
index 18c545ae96..d24199443c 100644
--- a/tools/aconfig/aconfig_protos/Android.bp
+++ b/tools/aconfig/aconfig_protos/Android.bp
@@ -17,7 +17,22 @@ java_library {
apex_available: [
"com.android.configinfrastructure",
"//apex_available:platform",
- ]
+ ],
+}
+
+java_library {
+ name: "libaconfig_java_proto_nano",
+ srcs: ["protos/aconfig.proto"],
+ static_libs: ["libprotobuf-java-nano"],
+ proto: {
+ type: "nano",
+ },
+ sdk_version: "current",
+ min_sdk_version: "UpsideDownCake",
+ apex_available: [
+ "//apex_available:platform",
+ ],
+ jarjar_rules: "jarjar-nano-rules.txt",
}
java_library_host {
@@ -58,7 +73,7 @@ rust_defaults {
],
proc_macros: [
"libpaste",
- ]
+ ],
}
rust_library {
diff --git a/tools/aconfig/aconfig_protos/jarjar-nano-rules.txt b/tools/aconfig/aconfig_protos/jarjar-nano-rules.txt
new file mode 100644
index 0000000000..b58fa64838
--- /dev/null
+++ b/tools/aconfig/aconfig_protos/jarjar-nano-rules.txt
@@ -0,0 +1 @@
+rule com.google.protobuf.** android.internal.framework.protobuf.@1 \ No newline at end of file