commit a3c500d0e13d9b38b0582a08573814f5d6922760
author Julien Desprez <jdesprez@google.com> Fri May 18 15:06:22 2018 -0700
committer android-build-merger <android-build-merger@google.com> Fri May 18 15:06:22 2018 -0700
tree 21a65cd5c5d6951d6fc6b1a03e701a6b59b0aef7
parent 2ea2d1cb10f4f7995db6878db6a8e436dd3aa010
parent 3146aa7630073c1a303e0cb131a8bf2ae70340c0

Merge "Add all the internal protos to the java protobuf lib"
am: 3146aa7630

Change-Id: I7e1dc5a7af2c0f3c2f856fdab5a23fd548d1b5b6

Android.bp

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",
 }