Add all the internal protos to the java protobuf lib
Mirror the python protobuf lib and add all the internal
protos to the java lib in order to be able to use
import google/protobuf/Any and such in proto definitions.
Test: make host-libprotobuf-java-full
Bug: 79990695
Change-Id: I3383f42b1de5cd31986cd79b6c4a82fb69fba122
diff --git a/Android.bp b/Android.bp
index c909d00..b86f764 100644
--- a/Android.bp
+++ b/Android.bp
@@ -572,12 +572,17 @@
name: "libprotobuf-java-full",
srcs: [
- // This contains more source files than needed for the full version, but the
- // additional files should not create any conflict.
"java/core/src/main/java/**/*.java",
- "src/google/protobuf/descriptor.proto",
+ ":libprotobuf-internal-protos",
],
+ proto: {
+ local_include_dirs: [
+ "src",
+ ],
+ canonical_path_from_root: false,
+ },
+
java_version: "1.7",
}
