Commit Graph

21247 Commits

Author SHA1 Message Date
Kousik Kumar 9ee45ad09a Revert "Load env variables before c.config()" am: 4e88859af0
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15741350

Change-Id: I954c16917928fe1e4eace7209558b42d517c14ab
2021-09-02 00:18:52 +00:00
Kousik Kumar 4e88859af0 Revert "Load env variables before c.config()"
This reverts commit 062b011502.

Reason for revert: This change is accidentally opting in a bunch of people into RBE because we aren't respecting USE_RBE variable in rvc-dev branch (possibly missing cherry-pick of some earlier fix).

Merged-In: I416e8da75f84aa2b53995f525cf50501488dc972
Change-Id: Ic678b63b165deb3ac4ec3d3c5cbc166621d8eec3
2021-09-01 22:16:51 +00:00
Kousik Kumar f04dc7f1b1 Load env variables before c.config() am: 062b011502
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15723183

Change-Id: I13773a3be06c8ad4426960b0f2fbc45bbed3e85f
2021-08-31 17:33:30 +00:00
Kousik Kumar 062b011502 Load env variables before c.config()
If the env variables are loaded after the config object is created, they aren't set in the Environment object inside the config object which causes RBE to not work

Bug: b/198045383
Test: Tested by running a build against rvc-dev branch and ensuring it works.
Change-Id: I509289467df81e5535b4cbbfe4e5eb336c0e4e59
2021-08-31 05:44:29 +00:00
Treehugger Robot 46d4a14089 Add FAILED: prefix to RBE Fatal error message" am: 907bbdfc9f
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15625816

Change-Id: If65b22f21e7b46113800525668598d63020c26fe
2021-08-19 19:09:43 +00:00
Treehugger Robot 907bbdfc9f Add FAILED: prefix to RBE Fatal error message"
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1560871

Bug: b/195592452
Change-Id: I00e2cb26eb3e1e3b695ba067cad24f45169f3a58
(cherry picked from commit ab2803a870)
Merged-In: Ie0c9acee2739acf149384e33804b5fca3273c24f
2021-08-19 17:08:49 +00:00
Kousik Kumar a907f283fc resolve merge conflicts of 233c1be0bd to rvc-dev am: 3c12576942
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15473760

Change-Id: Ied3e486f490decd767d4ae3c7c63947bf41cdc64
2021-08-06 15:45:40 +00:00
Kousik Kumar 3c12576942 resolve merge conflicts of 233c1be0bd to rvc-dev
Bug: b/194679562

Change-Id: Icb42c43c1b4c8018b1402bd508271a0d4a052b14
Merged-In: I416e8da75f84aa2b53995f525cf50501488dc972
2021-08-05 20:16:26 +00:00
Kousik Kumar 233c1be0bd Merge "Load RBE related env vars from config files" am: b3a5d18470 am: 9f6fa868c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15454953

Change-Id: Ie1e7b2bdb392c33a286d7f52e0fee4ccf560b1b7
2021-08-05 18:08:31 +00:00
Kousik Kumar 9f6fa868c5 Merge "Load RBE related env vars from config files" am: b3a5d18470
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1773209

Bug: b/194679562
Change-Id: Id84167a3ae6ab15c8b74b72b4cc2c179e0da5d0c
Merged-In: I416e8da75f84aa2b53995f525cf50501488dc972
(cherry picked from commit a7ab7c9394ccfc80e163b5e405792a3975eaf2f3)
2021-08-03 13:22:44 -04:00
Colin Cross 4090f7adbb Merge changes from topic "installclean-symbols-mainline-prod" into mainline-prod
* changes:
  Clean symbols directory during installclean
  Ignore cc.Module.HideFromMake when producing flattened apex Android.mk entries
2021-04-30 23:06:29 +00:00
Colin Cross 54f6a89c2f Clean symbols directory during installclean
Installclean is used in some build server builds when switching between
different TARGET_BUILD_APPS, remove the symbols directory so it doesn't
accumulate old symbols files.

Bug: 186507256
Test: m && m installclean && m
Change-Id: I316703cd0985ee555959a6dcdb39d5a702ab0332
Merged-In: I316703cd0985ee555959a6dcdb39d5a702ab0332
(cherry picked from commit f7bcd42a4a)
2021-04-30 09:56:25 -07:00
Kousik Kumar 36be361dfe Print the output from RBE bootstrap shutdown am: 91a46d0ef4 am: 1f3a7f6ccf am: 6874a5b8d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/14371203

Change-Id: I8fb3c7bd539172992352ff186166ea3e889e2d7c
2021-04-30 05:24:49 +00:00
Kousik Kumar 6874a5b8d0 Print the output from RBE bootstrap shutdown am: 91a46d0ef4 am: 1f3a7f6ccf
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/14371203

Change-Id: I7d8dd627fd0e93c2ae1a48bb635beb06089dd80a
2021-04-30 05:07:38 +00:00
Kousik Kumar 1f3a7f6ccf Print the output from RBE bootstrap shutdown am: 91a46d0ef4
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/14371203

Change-Id: Ie450c8f1b27f21246b5f17ae6a56b918b7a3a78a
2021-04-30 04:49:24 +00:00
Kousik Kumar 91a46d0ef4 Print the output from RBE bootstrap shutdown
The output from bootstrap would contain the a one-line summary of RBE
download / upload stats.

Bug: b/183007125
Change-Id: I90082a8433504e40bbf92992c3c8d1d656c49429
Merged-In: I90082a8433504e40bbf92992c3c8d1d656c49429
2021-04-29 20:49:13 -04:00
Colin Cross 49b6db40f4 Ignore cc.Module.HideFromMake when producing flattened apex Android.mk entries
The modules in a flattened apex have suffixes that ensure they don't
conflict with the platform versions, so they can ignore HideFromMake.
This ensures that Make can install symbols for all libraries in
apexes.

Fixes: 180622230
Test: banchan com.android.adbd && m && ls $OUT/symbols/apex/com.android.adbd/lib
Merged-In: I76d1aba2eed6ae27d9a954bf88f40f0d00fc6a98
Change-Id: I76d1aba2eed6ae27d9a954bf88f40f0d00fc6a98
2021-04-29 14:32:49 -07:00
Anton Hansson 5b1970e5da Remove sdk_version: "none" restriction
Not entirely sure what the history behind requiring only libcore
projects use this, but it is a bit annoying to have to allow-list every
use.

Bug: 173606718
Test: m nothing
Merged-In: I66f71e67d3f17e7f983c8537dff537fe8419da95
Change-Id: I66f71e67d3f17e7f983c8537dff537fe8419da95
(cherry picked from commit 0af20effc1)
2021-04-16 10:42:13 +01:00
Pedro Loureiro a763c6d8ca Add support for lint baseline files
Test: m droid
Test: go test ^TestJavaLint # (from soong/build/java)

Change-Id: I249a0a0597b0bf8495460ed283b476ad2eb36edc
Merged-In: I249a0a0597b0bf8495460ed283b476ad2eb36edc
2021-04-14 15:42:34 +00:00
Pedro Loureiro 9dcbfa4ae1 Update soong for new lint version
Test: m nothing
Merged-In: Iaa9d37ef73f1fef5f2dbb8a840e774bb86c65bf7
Change-Id: Iaa9d37ef73f1fef5f2dbb8a840e774bb86c65bf7
2021-04-08 12:16:46 +01:00
Sophie Zheng d148a481fd Merge "NDK API coverage" into mainline-prod 2021-04-05 20:03:58 +00:00
Sophie Zheng 42e89aa6c4 Merge "NDK API coverage" into mainline-prod 2021-04-05 18:56:13 +00:00
sophiez 7f7193a782 NDK API coverage
Cherry-pick from aosp: Update OWNERS file under build/soong/scripts to include coverage team as owner of related scripts.

Test: TARGET_BUILD_APPS=com.android.adbd m dist apps_only
Change-Id: I6150d5bda0d59828a985cd2ab5dd0aa38a7987c3
Merged-In: I6150d5bda0d59828a985cd2ab5dd0aa38a7987c3
2021-04-01 23:47:21 +00:00
sophiez 27a26526f0 NDK API coverage
Cherry-pick from aosp: Update the gen_ndk_usedby_apex.sh script to generate NDK API list with
library name.

Test: TARGET_BUILD_APPS=com.android.adbd m dist apps_only

Change-Id: I799e03ad7d81a4184229f658fd6c8824b9ba6e1f
Merged-In: I799e03ad7d81a4184229f658fd6c8824b9ba6e1f
2021-04-01 21:14:59 +00:00
Bob Badour 84d9b74510 [automerger skipped] Minimal license feature. am: 459beab694 -s ours am: b5d58b3eaa -s ours am: 64a932b9c7 -s ours am: 7ebfebdb93 -s ours
am skip reason: skip tag Change-Id Ic78672cd25da13aa9078a48b06446f66780c792d with SHA-1 58d85b87bc is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/13928045

Change-Id: I56d1275af0210b8d937ecd40d99f1041294ac9d6
2021-03-19 22:12:47 +00:00
Bob Badour 7ebfebdb93 [automerger skipped] Minimal license feature. am: 459beab694 -s ours am: b5d58b3eaa -s ours am: 64a932b9c7 -s ours
am skip reason: skip tag Change-Id Ic78672cd25da13aa9078a48b06446f66780c792d with SHA-1 58d85b87bc is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/13928045

Change-Id: Ieaddfa6ed52c8febdb199cb604f372afb350d65d
2021-03-19 21:30:21 +00:00
Bob Badour 3ca93c0c43 [automerger skipped] Minimal license feature. am: 58d85b87bc am: 6b4ddeb66c -s ours am: 967ca0a6f0 -s ours
am skip reason: skip tag Change-Id Ic78672cd25da13aa9078a48b06446f66780c792d with SHA-1 dc5be9099b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/13929165

Change-Id: I3f9c691944e662dc2cfa29a4db30e80ad5a5c815
2021-03-19 20:58:48 +00:00
Bob Badour 64a932b9c7 [automerger skipped] Minimal license feature. am: 459beab694 -s ours am: b5d58b3eaa -s ours
am skip reason: skip tag Change-Id Ic78672cd25da13aa9078a48b06446f66780c792d with SHA-1 58d85b87bc is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/13928045

Change-Id: I4393e98e96b34b0e4604e0c03a7cc2b16e7a5c2e
2021-03-19 20:54:22 +00:00
Bob Badour b5d58b3eaa [automerger skipped] Minimal license feature. am: 459beab694 -s ours
am skip reason: skip tag Change-Id Ic78672cd25da13aa9078a48b06446f66780c792d with SHA-1 58d85b87bc is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/13928045

Change-Id: If527f71987f23aee63aa0a1209572479672398c5
2021-03-19 20:20:01 +00:00
Bob Badour 967ca0a6f0 [automerger skipped] Minimal license feature. am: 58d85b87bc am: 6b4ddeb66c -s ours
am skip reason: skip tag Change-Id Ic78672cd25da13aa9078a48b06446f66780c792d with SHA-1 dc5be9099b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/13929165

Change-Id: I8fd218bbabaf658ef3408fbefe00b9eb2ed8e3f4
2021-03-19 20:15:33 +00:00
Bob Badour 6b4ddeb66c Minimal license feature. am: 58d85b87bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/13929165

Change-Id: I49453a723ea46a2bda5d21655e569c212564c076
2021-03-19 19:35:42 +00:00
Bob Badour 459beab694 Minimal license feature.
Keeps license declarations from breaking the build without implementing
the full feature.

Test: m all

Bug: 181768532

Change-Id: Ic78672cd25da13aa9078a48b06446f66780c792d
Merged-in: Ic78672cd25da13aa9078a48b06446f66780c792d
Merged-in: If3fbc157c6ffed8e3ee4bdd9aa56fabe2c24444b
Merged-in: Ie7e1695ecb8cd943124426a0cad2c0d1db2b46ed
2021-03-19 01:28:12 -07:00
Bob Badour 58d85b87bc Minimal license feature.
Keeps license declarations from breaking the build without implementing
the full feature.

Test: m all

Bug: 181768532

Change-Id: Ic78672cd25da13aa9078a48b06446f66780c792d
Merged-in: Ic78672cd25da13aa9078a48b06446f66780c792d
Merged-in: If3fbc157c6ffed8e3ee4bdd9aa56fabe2c24444b
Merged-in: Ie7e1695ecb8cd943124426a0cad2c0d1db2b46ed
2021-03-19 00:42:52 -07:00
Artur Satayev 8f0436697c Move allowed_deps.txt to packages/modules/common.
Bug: 179234385
Test: run update-apex-allowed-deps.sh locally
Change-Id: I8e8864468b87342c688d001bc5f6e6f8416863ed
Merged-In: I8e8864468b87342c688d001bc5f6e6f8416863ed
(cherry picked from commit 732d6264210513b971205b5c9f1b2f49b9cafdf3)
(cherry picked from commit 8dfcbe466c)
2021-03-17 11:32:42 +00:00
Bob Badour faa34da8f4 [automerger skipped] Minimal license feature. am: dc5be9099b -s ours
am skip reason: skip tag Change-Id Ie7e1695ecb8cd943124426a0cad2c0d1db2b46ed with SHA-1 5553f7fb61 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/13879853

Change-Id: Iba6877d032020d086a99ed13e6dcdf50302c47db
2021-03-16 23:20:19 +00:00
Bob Badour dc5be9099b Minimal license feature.
Keeps license declarations from breaking the build without implementing
the full feature.

Test: m all

Bug: 181768532

Change-Id: Ic78672cd25da13aa9078a48b06446f66780c792d
Merged-in: If3fbc157c6ffed8e3ee4bdd9aa56fabe2c24444b
Merged-in: Ie7e1695ecb8cd943124426a0cad2c0d1db2b46ed
2021-03-16 18:53:03 +00:00
TreeHugger Robot 2400302b8c Merge "Add hansson@ to OWNERS in mainline-prod." into mainline-prod 2021-03-16 17:06:16 +00:00
Artur Satayev c9d486488c Add hansson@ to OWNERS in mainline-prod.
Note this is not a full change I5a4b2d252bd9b3c280cd9954cf0e65ac21153ede.

Test: n/a
Merged-In: I5a4b2d252bd9b3c280cd9954cf0e65ac21153ede
Change-Id: I2fc9c8cde9195e3378b7a4267799025ede6a2e47
2021-03-16 15:52:37 +00:00
Artur Satayev 55bf387f54 Don't track modules that are only available to APEXes.
Modules that are not available for platform are developed with
updatability in mind, and do not require manual approvals.

Bug: 181223240
Test: checkbuild
Change-Id: I10b91053b3ef5a9ff5400d9d7a68fae3144a671c
Merged-In: I10b91053b3ef5a9ff5400d9d7a68fae3144a671c
(cherry picked from commit 533b98cde3)
2021-03-16 14:18:20 +00:00
TreeHugger Robot 9c2890cac3 Merge "Allow ExtServices to use tflite_support" into mainline-prod 2021-03-12 16:43:07 +00:00
Sophie Zheng 663778c712 Merge "Fix getting list of module libraries in builder.go" into mainline-prod 2021-03-11 23:38:08 +00:00
Anton Hansson 152868a736 Merge changes I2a02dc38,I40e8d4c0,Id3952e13 into mainline-prod
* changes:
  Implement OutputFiles for python modules.
  Support python binaries in sh_test_host
  Add data bin and lib properties to sh_test
2021-03-11 12:30:00 +00:00
Liz Kammer 2ebaa881d3 Implement OutputFiles for python modules.
This enables python binaries to be included in data properties with the
format ":module".

Test: m FirmwareDtboVerification with local changes
Bug: 153848038
Merged-In: I2a02dc382fcbb142d8e4fbdbb6ca461986627d25
Change-Id: I2a02dc382fcbb142d8e4fbdbb6ca461986627d25
(cherry picked from commit e0070ee313)
2021-03-11 11:03:52 +00:00
Anton Hansson 023707d317 Support python binaries in sh_test_host
Make the code for data_bins/data_device_binds module-type agnostic.

Bug: 176581143
Test: m gen_sdk_test
Merged-In: I40e8d4c06f583cae523d97ce63822960872907db
Change-Id: I40e8d4c06f583cae523d97ce63822960872907db
(cherry picked from commit 2f6422cb1e)
2021-03-11 10:17:30 +00:00
Jaewoong Jung aa3eac2e5b Add data bin and lib properties to sh_test
This attempts to reland I7b64de4b06e9bba3fba3712b25dd9f9d112e1625
by fixing Mac-related test issues, yet again.

Test: sh_binary_test.go
Test: Modified ziptool-tests
Bug: 156980228
Merged-In: Id3952e136c1dabfcd34048b6c9f31d0125a623df
Change-Id: Id3952e136c1dabfcd34048b6c9f31d0125a623df
(cherry picked from commit 6e0eee522d)
2021-03-11 10:17:02 +00:00
sophiez fdfe8f74fd Fix getting list of module libraries in builder.go
Replace f.stem to f.Stem() method otherwise empty libNames get passed
in.

Fixes:181991887

Test: DIST_DIR=~/my_dist_dir TARGET_BUILD_VARIANT=userdebug PRODUCT=mainline_modules_x86 ./vendor/google/build/build_unbundled_coverage_mainline_module.sh -j80

Change-Id: I3384f3a73c5637928584b9d87b2f936116a8f15e
Merged-In: Ie1799c0972d63da823ad375f008018de782529d1
2021-03-10 19:27:54 +00:00
TreeHugger Robot 98a2c750dd Merge "update apex/allowed_deps.txt" into mainline-prod 2021-03-09 22:03:39 +00:00
Tony Mak 9418d6747f Allow ExtServices to use tflite_support
tflite_support provides some tflite ops and utils functions.

> How big is the binary size increase for affected APEXes?
+100K
> Is the new dependency committed to support previous platform releases?
note that you have to support all the releases starting from the minSdkVersion value you are declaring
Yes.
> Is the new dependency being developed AOSP-first or internal?
AOSP-first. We don't "develop" it there tho.
We import the code from github and the library is developed by another
team in google.
> What’s the testing strategy for the new dependency? Does it have its own tests, and are you adding integration tests?
We test the library with our own unit and integration tests.

Bug: 169147920

Test: build/soong/scripts/update-apex-allowed-deps.sh

Change-Id: Ic15226dd36dce98f9a3e54672353f87adcc6312f
2021-03-09 12:02:00 +00:00
Artur Satayev ce06cc0c25 Introduce derive_classpath service.
go/updatable-classpath

Bug: 180105615
Test: manual + boot test
Change-Id: If0a3cb00754834133abea12caff3fdc5b7cff696
Merged-In: If0a3cb00754834133abea12caff3fdc5b7cff696
2021-03-09 00:11:13 +00:00
Jeongik Cha c38777cb75 update apex/allowed_deps.txt
Bug: 150578172
Test: m
Change-Id: I0ea6b33c2d27081a5f0622edb0f5df4088a71455
Merged-In: I0ea6b33c2d27081a5f0622edb0f5df4088a71455
2021-03-05 21:39:17 +09:00