commit 4a2c1b5ca3c049768ebaf8865245d9342b431870
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed May 15 07:20:45 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 15 07:20:45 2024 +0000
tree 2f1238ae33c79d3898f7d618479f08c093c1e093
parent 3e94ffd0ed606677edb7558388bb1491b0a80843
parent 5529e36e88f8320d1f7fcab533ec3dd668b92c27

Merge "Add a nano proto version of aconfig protos" into main

tools/aconfig/aconfig_protos/Android.bp

diff --git a/tools/aconfig/aconfig_protos/Android.bp b/tools/aconfig/aconfig_protos/Android.bp
index 18c545a..d241994 100644
--- a/tools/aconfig/aconfig_protos/Android.bp
+++ b/tools/aconfig/aconfig_protos/Android.bp
@@ -17,7 +17,22 @@
     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 @@
     ],
     proc_macros: [
         "libpaste",
-    ]
+    ],
 }
 
 rust_library {

tools/aconfig/aconfig_protos/jarjar-nano-rules.txt

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 0000000..b58fa64
--- /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