diff options
author | Hidehiko Abe <hidehiko@google.com> | 2018-06-05 17:05:05 +0900 |
---|---|---|
committer | Treehugger Robot <treehugger-gerrit@google.com> | 2018-06-06 01:55:42 +0000 |
commit | 5877901a807bc75cb7d6c0140590c97af443e373 (patch) | |
tree | 2b9e37761da690271b912cbddd4f03a87a957acc | |
parent | efb5eadb43f28b630f3501eea4c063d4195b384c (diff) | |
download | libchrome-5877901a807bc75cb7d6c0140590c97af443e373.tar.gz |
Use libmojo_mojom.srcjar.android-n-iot-release-polk-at1
So that it is no longer needed to list all generated java files
in Android.bp.
Bug: 79557560
Test: Built, and made sure android.mojo.jar contains generated class files.
Change-Id: I4349f85353b79a730b049e76e839133cad37ee04
-rw-r--r-- | Android.bp | 48 | ||||
-rwxr-xr-x | libchrome_tools/mojom_source_generator.sh | 8 |
2 files changed, 10 insertions, 46 deletions
diff --git a/Android.bp b/Android.bp index f105753599..1cb63dd806 100644 --- a/Android.bp +++ b/Android.bp @@ -946,6 +946,7 @@ genrule { " --typemap=$(location common_custom_types__type_mappings)" + " --generators=java" + " --use_new_wrapper_types" + + " --srcjar=$(out)" + " $(in)", tools: [ @@ -957,52 +958,7 @@ genrule { srcs: [":libmojo_mojom_files"], - out: [ - "src/org/chromium/gfx/mojom/InsetsF.java", - "src/org/chromium/gfx/mojom/Insets.java", - "src/org/chromium/gfx/mojom/PointF.java", - "src/org/chromium/gfx/mojom/Point.java", - "src/org/chromium/gfx/mojom/RangeF.java", - "src/org/chromium/gfx/mojom/Range.java", - "src/org/chromium/gfx/mojom/RectF.java", - "src/org/chromium/gfx/mojom/Rect.java", - "src/org/chromium/gfx/mojom/SizeF.java", - "src/org/chromium/gfx/mojom/Size.java", - "src/org/chromium/gfx/mojom/Vector2dF.java", - "src/org/chromium/gfx/mojom/Vector2d.java", - "src/org/chromium/IPC/mojom/ChannelBootstrap_Internal.java", - "src/org/chromium/IPC/mojom/ChannelBootstrap.java", - "src/org/chromium/IPC/mojom/Channel_Internal.java", - "src/org/chromium/IPC/mojom/Channel.java", - "src/org/chromium/IPC/mojom/GenericInterface_Internal.java", - "src/org/chromium/IPC/mojom/GenericInterface.java", - "src/org/chromium/IPC/mojom/IpcConstants.java", - "src/org/chromium/IPC/mojom/SerializedHandle.java", - "src/org/chromium/mojo/bindings/interfacecontrol/FlushForTesting.java", - "src/org/chromium/mojo/bindings/interfacecontrol/InterfaceControlMessagesConstants.java", - "src/org/chromium/mojo/bindings/interfacecontrol/QueryVersion.java", - "src/org/chromium/mojo/bindings/interfacecontrol/QueryVersionResult.java", - "src/org/chromium/mojo/bindings/interfacecontrol/RequireVersion.java", - "src/org/chromium/mojo/bindings/interfacecontrol/RunInput.java", - "src/org/chromium/mojo/bindings/interfacecontrol/RunMessageParams.java", - "src/org/chromium/mojo/bindings/interfacecontrol/RunOrClosePipeInput.java", - "src/org/chromium/mojo/bindings/interfacecontrol/RunOrClosePipeMessageParams.java", - "src/org/chromium/mojo/bindings/interfacecontrol/RunOutput.java", - "src/org/chromium/mojo/bindings/interfacecontrol/RunResponseMessageParams.java", - "src/org/chromium/mojo/bindings/pipecontrol/DisconnectReason.java", - "src/org/chromium/mojo/bindings/pipecontrol/PeerAssociatedEndpointClosedEvent.java", - "src/org/chromium/mojo/bindings/pipecontrol/PipeControlMessagesConstants.java", - "src/org/chromium/mojo/bindings/pipecontrol/RunOrClosePipeInput.java", - "src/org/chromium/mojo/bindings/pipecontrol/RunOrClosePipeMessageParams.java", - "src/org/chromium/mojo/common/mojom/File.java", - "src/org/chromium/mojo/common/mojom/String16.java", - "src/org/chromium/mojo/common/mojom/TextDirection.java", - "src/org/chromium/mojo/common/mojom/TimeDelta.java", - "src/org/chromium/mojo/common/mojom/Time.java", - "src/org/chromium/mojo/common/mojom/TimeTicks.java", - "src/org/chromium/mojo/common/mojom/UnguessableToken.java", - "src/org/chromium/mojo/common/mojom/Version.java", - ], + out: ["libmojo_mojom.srcjar"], } java_library { diff --git a/libchrome_tools/mojom_source_generator.sh b/libchrome_tools/mojom_source_generator.sh index 6830241868..589b46248d 100755 --- a/libchrome_tools/mojom_source_generator.sh +++ b/libchrome_tools/mojom_source_generator.sh @@ -71,6 +71,10 @@ for arg in "$@"; do --generators=*) generators="${arg#'--generators='}" ;; + --srcjar=*) + srcjar="${arg#'--srcjar='}" + srcjar="$(get_abs_path ${srcjar})" + ;; --*) args=("${args[@]}" "${arg}") ;; @@ -113,3 +117,7 @@ for file in "${files[@]}"; do unzip -qo -d "${output_dir}"/src "${output_dir}/${rel_path}".srcjar fi done + +if [[ -n "${srcjar}" ]] ; then + (cd "${output_dir}/src" && find . -name '*.java' -print | zip "${srcjar}" -@) +fi |