commit 0647e788dc0efee9fcdabfe54fce00119f119ca0
author Alexander Dorokhine <adorokhine@google.com> Tue Jun 09 16:11:53 2020 -0700
committer Alexander Dorokhine <adorokhine@google.com> Tue Jun 09 16:26:06 2020 -0700
tree 9864474a9da94de20a2b370b1abe0518137c49f9
parent 770e599cf02866bb87e497c62bbe87a45e05cc79
parent 42a60e1b4c64f439e85928123dff4a79d1ca1a2f

Merge remote-tracking branch 'aosp/upstream-master' into androidx-master-dev

* aosp/upstream-master:
  Update from upstream, including proto location changes.

Bug: 158587690
Change-Id: Ib6134a09fa8832e980daa3c795775a32a8430c30

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c002af0..119b086 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,6 +19,7 @@
     "${CMAKE_CURRENT_SOURCE_DIR}/../../prebuilts/protobuf")
 set(Protobuf_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../protobuf")
 set(Protobuf_TARGET_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/protobuf-target")
+set(Icing_PROTO_GEN_DIR "${CMAKE_CURRENT_BINARY_DIR}/icing-protobuf-gen")
 
 ## Configure libprotobuf ##
 # Find the right protoc to compile our proto files
@@ -48,12 +49,11 @@
 file(
     GLOB_RECURSE
     Icing_PROTO_FILES
-    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    "icing/*.proto")
+    RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}/proto"
+    "*.proto")
 message(STATUS "Icing_PROTO_FILES=${Icing_PROTO_FILES}")
 
 # Run protoc on Icing_PROTO_FILES to generate pb.cc and pb.h files
-set(Icing_PROTO_GEN_DIR "${PROTO_GENERATED_FILES_BASE_DIR}/cpp")
 file(MAKE_DIRECTORY ${Icing_PROTO_GEN_DIR})
 foreach(FILE ${Icing_PROTO_FILES})
     # Find the name of the proto file without the .proto extension
@@ -65,7 +65,7 @@
         OUTPUT "${Icing_PROTO_GEN_DIR}/${FILE_NOEXT}.pb.cc"
           "${Icing_PROTO_GEN_DIR}/${FILE_NOEXT}.pb.h"
         COMMAND ${Protobuf_PROTOC_PATH}
-          --proto_path ${CMAKE_CURRENT_SOURCE_DIR}
+          --proto_path "${CMAKE_CURRENT_SOURCE_DIR}/proto"
           --cpp_out ${Icing_PROTO_GEN_DIR}
           ${FILE}
         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}