Commit Graph

22826 Commits

Author SHA1 Message Date
Jaewoong Jung
8066ebc38f Merge "Soong package structure refactoring" am: 264700345d am: ca9ed9158d
Original change: undetermined

Change-Id: I5cd95c02ab8af420dc2b7166ba24bdf0c7dc6496
2020-06-02 16:57:16 +00:00
Jaewoong Jung
ca9ed9158d Merge "Soong package structure refactoring" am: 264700345d
Original change: undetermined

Change-Id: I2b482006094cf5f2a5037177f78edf649386f78b
2020-06-02 16:45:48 +00:00
Jaewoong Jung
264700345d Merge "Soong package structure refactoring" 2020-06-02 16:30:50 +00:00
Treehugger Robot
68e90ef846 Merge "Copy removed.txt file to the snapshot correctly" am: b47ab4b79f am: 8fc769dd85
Original change: undetermined

Change-Id: I5846b5bd6c7c470d4732d49a90ff800b35975e7b
2020-06-02 16:09:42 +00:00
Treehugger Robot
8fc769dd85 Merge "Copy removed.txt file to the snapshot correctly" am: b47ab4b79f
Original change: undetermined

Change-Id: If04cb2450ee42cfe97dfab3511726ceb6c397c89
2020-06-02 15:52:09 +00:00
Treehugger Robot
b47ab4b79f Merge "Copy removed.txt file to the snapshot correctly" 2020-06-02 15:36:39 +00:00
Ulyana Trafimovich
12d342de36 Merge "Clean up class loader context generation." am: 5af1e93993 am: 5282305767
Original change: undetermined

Change-Id: Ide3cc6912373d4b39dcd029731b3f30855c8a8bc
2020-06-02 14:46:19 +00:00
Ulyana Trafimovich
5282305767 Merge "Clean up class loader context generation." am: 5af1e93993
Original change: undetermined

Change-Id: Id56144f63a8f1400b20190aca44cc67b736d64c7
2020-06-02 14:23:02 +00:00
Ulyana Trafimovich
5af1e93993 Merge "Clean up class loader context generation." 2020-06-02 14:13:43 +00:00
Paul Duffin
3dbf9fd892 Copy removed.txt file to the snapshot correctly
Previously, the code copied the current.txt file to both the
current_api and removed_api properties. This change copies the
removed.txt file to the removed_api property instead.

Bug: 157980685
Test: m nothing
Change-Id: Iad34e91051da43222d22c240c16f50887c43d73e
2020-06-02 14:40:28 +01:00
Paul Duffin
56e303ae4e Always run package check am: 91206d9ed1 am: d08b1040cb
Original change: undetermined

Change-Id: I7eed39d6b49b0e837c8ad0689a8e728f7b329e41
2020-06-02 13:31:18 +00:00
Paul Duffin
d08b1040cb Always run package check am: 91206d9ed1
Original change: undetermined

Change-Id: I0adc92199f39a0f94b377fba89faa30cd8af43d7
2020-06-02 13:16:35 +00:00
Paul Duffin
91206d9ed1 Always run package check
Previously, the package check was only run when building checkbuild or
the phony target created for a specific module. It would not run when
building a module that depended upon a library with the
permitted_packages property. That was because the package check was
only run when the package-check.stamp file was built and that was only
added to the phony and checkbuild targets.

Instead of touching a separate package-check.stamp file to indicate
that the check has been performed this change copies the input jar file
to the package check to a separate ../package-check/<jar> file which is
then treated as the output of the library and is the input for any dex
processing. So, any modules that depend on this library will
transitively depend on the output file produced by the package check
command and so will ensure that the package check is always run.

Test: Removed "android.net" from the permitted_packages for
      "framework-tethering", build "framework-tethering" which
      triggered and failed the package check and
      "com.android.tethering" which did not.
      Made this change.
      Built "com.android.tethering" which triggered and then failed the
      package check.
      Removed change to "framework-tethering"
Bug: 157649935
Change-Id: Ib01aa09e13f80282218049270eb7a58ec5f9f605
2020-06-02 10:29:47 +01:00
Treehugger Robot
804dd8142c Merge "Upload build metrics after a build is completed." am: 039b04f4fc am: dedcd7a8cc
Original change: undetermined

Change-Id: I36e238781e2d387eec58dfbbd39256380d754935
2020-06-01 21:48:22 +00:00
Treehugger Robot
dedcd7a8cc Merge "Upload build metrics after a build is completed." am: 039b04f4fc
Change-Id: Ic2176b9549d1b027650f466072d1910ab9373b11
2020-06-01 21:05:50 +00:00
Treehugger Robot
039b04f4fc Merge "Upload build metrics after a build is completed." 2020-06-01 20:44:54 +00:00
Jaewoong Jung
4b79e98a6e Soong package structure refactoring
Give prebuilt_etc and sh_binary their own packages and split the
gigantic main Android.bp up to small, per-package ones.

Test: m nothing, TreeHugger
Bug: 156980228
Change-Id: I7b00cd344b9f16861f1ff39edf0029f016b853d0
2020-06-01 13:44:48 -07:00
Patrice Arruda
219eef3878 Upload build metrics after a build is completed.
Soong now supports the ability to upload metrics to another location
by setting the ANDROID_ENABLE_METRICS_UPLOAD to an uploader that
accepts the upload.proto proto buffer message. When the environment
variable is set, a set of build metrics files (soong_metrics,
rbe_metrics.pb and build_error) is uploaded.

Bug: 140638454
Test: * Wrote unit test cases
      * Setup the uploader, built a succcessful and failed aosp_arm-eng
        target and monitor the uploading of the metrics.
Change-Id: I76a65739c557dc90345e098ca03119a950ece2d2
2020-06-01 17:29:30 +00:00
Treehugger Robot
a034aecb73 Merge "Improved formatting of a module list in a panic message." am: a91b64d3ee am: 31771f8f14
Change-Id: I5a7fdb194011300b86a42f8dd8b8dfcf95e6d3d3
2020-06-01 16:58:01 +00:00
Ulya Trafimovich
696c59dbfa Clean up class loader context generation.
Deduplicate code for conditional class loader contexts that depend
on the target SDK version in the manifest.

Test: lunch aosp_cf_phone-userdebug && m
Change-Id: I69d51b212bf502b2659d43f124ea3922f90e1881
2020-06-01 17:55:56 +01:00
Treehugger Robot
31771f8f14 Merge "Improved formatting of a module list in a panic message." am: a91b64d3ee
Change-Id: I10a306bd9bd966d10814e8a220aa47e081daeb10
2020-06-01 16:32:51 +00:00
Treehugger Robot
a91b64d3ee Merge "Improved formatting of a module list in a panic message." 2020-06-01 16:20:50 +00:00
Ulyana Trafimovich
a5b0450554 Merge "Add android.test.base to class loader context for API version < 30." am: ad02d401ab am: 6200c519e2
Change-Id: I998889df1bd34e7bb15df3cd5791cb5f70d7d0ae
2020-06-01 15:29:22 +00:00
Ulyana Trafimovich
6200c519e2 Merge "Add android.test.base to class loader context for API version < 30." am: ad02d401ab
Change-Id: Ifa9b4e4d6ea5d01b487882db904e7ab6542133b6
2020-06-01 15:18:13 +00:00
Ulyana Trafimovich
ad02d401ab Merge "Add android.test.base to class loader context for API version < 30." 2020-06-01 15:05:25 +00:00
Ulya Trafimovich
c9af538c90 Add android.test.base to class loader context for API version < 30.
Test: lunch aosp_cf_x86_phone-userdebug && m
Change-Id: Id2ece4b2a6317998e1dd177e853848cc3956f39f
2020-06-01 12:51:38 +01:00
Martin Stjernholm
1b54c4f596 Merge "Propagate flags necessary for a prebuilt of the Bionic linker." am: a6a224586b am: 7ba2203249
Change-Id: Iefeade1282ad4c0a2598cd36e56f8c5210d515ed
2020-06-01 10:18:28 +00:00
Martin Stjernholm
7ba2203249 Merge "Propagate flags necessary for a prebuilt of the Bionic linker." am: a6a224586b
Change-Id: I7f6ebf40a2c2aff687f6c3a2eaa35fb399371b08
2020-06-01 10:06:27 +00:00
Martin Stjernholm
a6a224586b Merge "Propagate flags necessary for a prebuilt of the Bionic linker." 2020-06-01 09:55:10 +00:00
Inseob Kim
fee700db4f [automerger skipped] Merge "Capture libeigen's header correctly" am: 16fdea928b am: fadd0b7db4 -s ours
am skip reason: Change-Id I82f27d4c6c4d472f47d54c545328150697b8cda3 with SHA-1 67f3dbca2f is in history

Change-Id: I4c8e54d618b55a8b4ffe5fff7e9f4962a6641f2b
2020-06-01 01:41:53 +00:00
Inseob Kim
fadd0b7db4 Merge "Capture libeigen's header correctly" am: 16fdea928b
Change-Id: Ifbca5ad323c5f3cfe2a605e2379bec45ffc15c7c
2020-06-01 01:29:12 +00:00
Inseob Kim
16fdea928b Merge "Capture libeigen's header correctly" 2020-06-01 01:21:41 +00:00
Inseob Kim
04f2d6a675 Capture libeigen's header correctly
libeigen exports entire directory, but only two directories contain
actual exported headers. And some of headers have no extension. This
adds a special behaviour for external/eigen when capturing snapshot.

Exempt-From-Owner-Approval: cherry-pick from internal branch

Bug: 157106227
Test: m vendor-snapshot captures libeigen's headers
Change-Id: I82f27d4c6c4d472f47d54c545328150697b8cda3
Merged-In: I82f27d4c6c4d472f47d54c545328150697b8cda3
(cherry picked from commit 67f3dbca2f)
2020-06-01 01:07:48 +00:00
Jiyong Park
7a12fd11ee Merge "Use Stem where output file name is expected in APEX" am: 0e666433cd am: 611703096e
Change-Id: I94d8f5541deea86310ad3b249b670c61623f3b96
2020-06-01 01:02:03 +00:00
Jiyong Park
611703096e Merge "Use Stem where output file name is expected in APEX" am: 0e666433cd
Change-Id: I9adbbb23e7af54994cb76ac587285282450ac76c
2020-06-01 00:49:23 +00:00
Jiyong Park
0e666433cd Merge "Use Stem where output file name is expected in APEX" 2020-06-01 00:35:48 +00:00
Inseob Kim
7c26c8c95c Merge "Capture libeigen's header correctly" into rvc-dev am: c344620ed6
Change-Id: Ie0a1438f17d720a423d1aae4bc0832fe7d1d0e43
2020-05-31 16:04:51 +00:00
Inseob Kim
c344620ed6 Merge "Capture libeigen's header correctly" into rvc-dev 2020-05-31 15:49:54 +00:00
TreeHugger Robot
7ee272cdcb [automerger skipped] Merge "Add support for remote-execution / caching of jar/zip actions" into rvc-dev am: 07e99ad358 -s ours
am skip reason: Change-Id Ia17b532fbb282be414adf879914870082dd0841b with SHA-1 366afc5011 is in history

Change-Id: I3d50ef9cf2c826b53fabb8fc1d68182cce495b79
2020-05-31 02:29:10 +00:00
TreeHugger Robot
07e99ad358 Merge "Add support for remote-execution / caching of jar/zip actions" into rvc-dev 2020-05-31 02:17:58 +00:00
Kousik Kumar
f1cadc742c [automerger skipped] Merge "Add support for remote-execution / caching of signapk actions" into rvc-dev am: 6619d28c15 -s ours
am skip reason: Change-Id I4b8c21320c2f38914ef39d3d8f036d885fab4e72 with SHA-1 309b1c0da3 is in history

Change-Id: I40958809b0eeecc942f54b57fd434848a38ad7b9
2020-05-31 01:19:04 +00:00
Kousik Kumar
b2d43d54f0 [automerger skipped] Merge "Add support for remote-execution / caching of turbine actions" into rvc-dev am: 6888f1cb7a -s ours
am skip reason: Change-Id I85c334e6998c6dd2a68460b3580d50fffd900e6f with SHA-1 1372c1b430 is in history

Change-Id: I368aa61260137a0b1303c0d4e520b63492a2ab87
2020-05-31 01:18:51 +00:00
Kousik Kumar
6619d28c15 Merge "Add support for remote-execution / caching of signapk actions" into rvc-dev 2020-05-31 01:10:18 +00:00
Kousik Kumar
6888f1cb7a Merge "Add support for remote-execution / caching of turbine actions" into rvc-dev 2020-05-31 01:10:05 +00:00
Jiyong Park
39f867b523 [automerger skipped] Merge "Notice file embededd in APEX is deterministic" into rvc-dev am: 327b057e84 -s ours
am skip reason: Change-Id I25f6cd9dd0679af6acfc2594314d11fa53ae2151 with SHA-1 33c7736936 is in history

Change-Id: I86daca0dcdb2293c6f7494801756db69f07b4729
2020-05-30 22:44:39 +00:00
Jiyong Park
327b057e84 Merge "Notice file embededd in APEX is deterministic" into rvc-dev 2020-05-30 22:35:47 +00:00
Kousik Kumar
c05da0a90e Add support for remote-execution / caching of jar/zip actions
Test: Ran a build with `RBE_JAR="true" RBE_JAR_EXEC_STRATEGY="remote"
RBE_ZIP="true" RBE_ZIP_EXEC_STRATEGY="remote" ... use_rbe m` and that
succeeded.

Bug: b/156765207
Change-Id: Ia17b532fbb282be414adf879914870082dd0841b
Merged-In: Ia17b532fbb282be414adf879914870082dd0841b
2020-05-30 19:59:10 +00:00
Kousik Kumar
15e9d0dbf8 Add support for remote-execution / caching of signapk actions
Test: "RBE_SIGNAPK=true RBE_SIGNAPK_EXEC_STRATEGY=remote ... use_rbe m" on crosshatch-userdebug and
signapk targets worked
Bug: b/156765091

Change-Id: I4b8c21320c2f38914ef39d3d8f036d885fab4e72
Merged-In: I4b8c21320c2f38914ef39d3d8f036d885fab4e72
2020-05-30 19:58:58 +00:00
Kousik Kumar
d8c3955119 Add support for remote-execution / caching of turbine actions
Test: Ran a sample turbine action with:
RBE_TURBINE_EXEC_STRATEGY="remote" RBE_TURBINE="true" ... use_rbe m out/soong/.intermediates/external/protobuf/libprotobuf-java-micro/android_common/turbine/libprotobuf-java-micro.jar
and checked in reproxy_log.txt that remote-metadata had status SUCCESS.

Bug: b/156765475
Change-Id: I85c334e6998c6dd2a68460b3580d50fffd900e6f
Merged-In: I85c334e6998c6dd2a68460b3580d50fffd900e6f
2020-05-30 12:58:20 -07:00
Jiyong Park
402ace6c25 Notice file embededd in APEX is deterministic
Exempt-From-Owner-Approval: cherry-pick from AOSP

Bug: 157724521
Test: m
Merged-In: I25f6cd9dd0679af6acfc2594314d11fa53ae2151
(cherry picked from commit 33c7736936)
Change-Id: I25f6cd9dd0679af6acfc2594314d11fa53ae2151
2020-05-30 12:11:16 +00:00