openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
39,111 Commits 2 Branches 1 Tag 34 MiB
Commit Graph

39111 Commits

Author SHA1 Message Date
Christopher Parsons a86985e40a Merge "mixed builds for cc_static_library without deps" am: 2bed9ffaf4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625068

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifb10ef59263b84badad178de1b34b0acc06cc19d
 2021-03-11 15:21:50 +00:00
Paul Duffin df0b483089 Merge "Convert system modules tests to use fixtures" am: 6f688d03c8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628001

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I72ab39aa93ad79fd53f97ca3b3eb08ea327451e8
 2021-03-11 15:21:42 +00:00
Paul Duffin 7c05abc397 Merge "Separate system modules tests into their own file" am: 8075291a94 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628000

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I629d3459f4c2467233baadd891d6e11630900208
 2021-03-11 15:21:32 +00:00
Paul Duffin 08e8a82ebb Merge "prebuilt_apis should create a java_system_modules_import" am: f18ff339a9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626518

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I920b5d2496f956ac41ba6a631c848445d7c36ffb
 2021-03-11 15:21:18 +00:00
Jaewoong Jung 4bc4800ce7 Merge "Populate baseline_file values." am: 48b8df14be 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1624707

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia3586bc9e7bc9f8e31ec98c3fb021f3ad1f7d7cc
 2021-03-11 15:20:56 +00:00
Paul Duffin cc285a8253 Merge "Add preparer for test with variables" am: 8c004c6c04 am: c371cbb33d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626512

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7d959c9b1c80ccc8ba367fe27ca1a4734fd6d7eb
 2021-03-11 15:20:39 +00:00
Paul Duffin 8bbbff16d9 Merge "Add AssertStringListContains to TestHelper" am: 01c76ca278 am: f2def2fc4e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626510

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8e655f2059f13468aaf821addac0d45edd409491
 2021-03-11 15:20:33 +00:00
Paul Duffin 9225cc2bf9 Merge "Convert fuchsia tests to use test fixtures" am: 4e1916011c am: 3dbfef078e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626509

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I595f9751658d369f20b1b17003442ae1b47a18ac
 2021-03-11 15:20:26 +00:00
Christopher Parsons 2bed9ffaf4 Merge "mixed builds for cc_static_library without deps" 2021-03-11 15:11:44 +00:00
Paul Duffin 6f688d03c8 Merge "Convert system modules tests to use fixtures" 2021-03-11 15:11:20 +00:00
Paul Duffin 8075291a94 Merge "Separate system modules tests into their own file" 2021-03-11 15:10:54 +00:00
Paul Duffin f18ff339a9 Merge "prebuilt_apis should create a java_system_modules_import" 2021-03-11 15:09:47 +00:00
Jaewoong Jung 48b8df14be Merge "Populate baseline_file values." 2021-03-11 15:04:52 +00:00
Paul Duffin 6a1160e749 Convert cc/prebuilt_test.go to use fixtures 
Bug: 181070625
Test: m nothing
Change-Id: I6048812962382e2adaf79d941a24e5c0ffdd9b25
 2021-03-11 15:04:43 +00:00
Paul Duffin 6c9da044f8 Add preparer for test to use AndroidMk 
Bug: 181070625
Test: m nothing
Change-Id: I6b408d44e82d3bac6661bf6b54020c5c4051900e
 2021-03-11 15:04:43 +00:00
Paul Duffin 7d8a8ad0d1 Convert cc/cc_test.go tests that use CreateTestContext to fixtures 
Bug: 181070625
Test: m nothing
Change-Id: I7e57c978fa07ee8c0f35d567753751bd7b128b1e
 2021-03-11 15:04:39 +00:00
Paul Duffin c371cbb33d Merge "Add preparer for test with variables" am: 8c004c6c04 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626512

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I25e2d4b3d00f1a97e80197231a92792342eb49f9
 2021-03-11 14:40:40 +00:00
Paul Duffin f2def2fc4e Merge "Add AssertStringListContains to TestHelper" am: 01c76ca278 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626510

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If44fcbc388abab527cb7b9fa3f2507fc6d292de7
 2021-03-11 14:40:30 +00:00
Paul Duffin 3dbfef078e Merge "Convert fuchsia tests to use test fixtures" am: 4e1916011c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626509

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie6395327af14e39d05ef04839f49a600d5a63e15
 2021-03-11 14:39:41 +00:00
Paul Duffin 8c004c6c04 Merge "Add preparer for test with variables" 2021-03-11 14:35:57 +00:00
Paul Duffin 25259e93e1 Add preparer for test to allow missing dependencies 
Bug: 181070625
Test: m nothing
Change-Id: I426fcb19d9bea8b9551dc5c3a803228a34768fc0
 2021-03-11 14:34:10 +00:00
Paul Duffin 1ef166e411 Correct error in documentation of AssertDeepEquals 
Bug: 181070625
Test: m nothing
Change-Id: Ie9bb46a7c29e800822d4bc67b23a457e17e5e29a
 2021-03-11 14:34:10 +00:00
Paul Duffin e7a055c6a3 Add preparer for test with variables 
Bug: 181070625
Test: m nothing
Change-Id: I101826d88e67c63a58007f20f8e24d574dd7c99b
 2021-03-11 14:16:49 +00:00
Paul Duffin 01c76ca278 Merge "Add AssertStringListContains to TestHelper" 2021-03-11 14:08:01 +00:00
Paul Duffin 4e1916011c Merge "Convert fuchsia tests to use test fixtures" 2021-03-11 14:07:01 +00:00
Paul Duffin 981b94b460 Switch CheckSnapshot from a testSdkResult method to a function 
This will allow the testSdkResult to be replaced with the TestResult
when switching sdk package to use test fixtures.

Bug: 181070625
Test: m nothing
Change-Id: Ieca63f4c189f5e804102aeb4073289ea03143b6e
 2021-03-11 13:39:24 +00:00
Paul Duffin 8306f25679 Make testSdkResult compatible with android.TestResult 
This change makes it easier to switch the sdk package over to using the
new fixture mechanism by removing inconsistencies between the
testSdkResult and TestResult structures.

Bug: 181070625
Test: m nothing
Change-Id: Ic4c06e08ea5060fd09123f2ca65580e18b4d2ef6
 2021-03-11 13:38:56 +00:00
Anton Hansson a1a971bf37 [automerger skipped] Merge changes I2a02dc38,I40e8d4c0,Id3952e13 into mainline-prod am: 152868a736 -s ours 
am skip reason: Change-Id I2a02dc382fcbb142d8e4fbdbb6ca461986627d25 with SHA-1 e0070ee313 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8d4099238903bab7f03be2bf33d50f7d82b9f3bd
 2021-03-11 13:16:13 +00:00
Lukacs T. Berki 778c31d32f Hard-wire the path to xcrun as /usr/bin/xcrun. am: 21d5c7aaa9 am: 8f23c72f9e am: 177e95d4d6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626516

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I980be00ea77f4423ff04f4c44b03391aef94d735
 2021-03-11 12:38:50 +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
Lukacs T. Berki 177e95d4d6 Hard-wire the path to xcrun as /usr/bin/xcrun. am: 21d5c7aaa9 am: 8f23c72f9e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626516

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I438f4b45ca2e5665ce4b234bafec763893356ce4
 2021-03-11 11:57:06 +00:00
Artur Satayev ff36f17b40 Introduce derive_classpath service. 
go/updatable-classpath

Bug: 180105615
Test: manual + boot test
Change-Id: I713b3b881e2214f2994e1830580ae1122d7c5c3d
 2021-03-11 11:46:28 +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
Lukacs T. Berki 8f23c72f9e Hard-wire the path to xcrun as /usr/bin/xcrun. am: 21d5c7aaa9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626516

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia4d3cedc38f0d29e5cc7dbe135525b5922f63129
 2021-03-11 10:59:32 +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
Paul Duffin 4f0a75abde Ensure java_system_modules_import uses prebuilts 
Make sure that java_system_modules_import always depends on the
prebuilt by adding dependencies in the ComponentDepsMutator() method
which is called before prebuilts without a corresponding source are
renamed from prebuilt_<x> to <x>. That requires the prebuilt_ prefix
to be provided but it ensures that the dependencies are safe.

Similar logic also makes sure java_system_modules always depends on
the source module and not on a renamed prebuilt module.

Bug: 182402568
Test: m nothing
Change-Id: I30db95978f5d9b205951011edf40585ee36c0c4c
 2021-03-11 09:40:02 +00:00
Paul Duffin c52bea9555 Improve system modules tests 
The previous approach of looking for substrings in the command that
matched the base name of the jar could not differentiate between
whether the jar was a prebuilt or a source as they both have the same
base name.

The tests also did not cover the case when there was both prebuilts
and source modules.

This change:
1. Checks that the inputs to the command come from the appropriate
   module.
2. Adds a mixed test.
3. Deduped the source and prebuilt module definitions.

The new test reveals the buggy behavior which will be fixed in a follow
up change.

Bug: 182402568
Test: m nothing
Change-Id: I384ecca097cbe3560e7589c23fb99c176a42fd9b
 2021-03-11 09:39:18 +00:00
Lukács T. Berki 8da97ecddc Merge "Fix writedocs." am: dfa33be445 am: 9632e13c5a am: e108ab7b8d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626499

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9c8c6bd34c3977b97f3aa4a5ee8d550283ec0b85
 2021-03-11 09:30:20 +00:00
Lukács T. Berki 4c02c2c337 Merge "Print a correct error message when a non-hermetic tool is not found." am: a55aefd57b am: d922efecce am: ee4a95f1b5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625979

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I81a7ec7d85e6c48032bcfed9ddf9f8dfd5f5f408
 2021-03-11 09:30:12 +00:00
Lukács T. Berki c5d4bef771 Merge "Fix the environment of soong_build:" am: 2373e597ea am: 6222fd77f5 am: 6a4cb09496 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625980

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I05dbb9f639a6a97def0e8f13ec74560188e87f12
 2021-03-11 09:29:43 +00:00
Paul Duffin f23e346f6c Convert system modules tests to use fixtures 
Bug: 182402568
Test: m nothing
Change-Id: I0535e60a692925b141e465d8e1ec92be21d54c88
 2021-03-11 08:32:01 +00:00
Lukács T. Berki e108ab7b8d Merge "Fix writedocs." am: dfa33be445 am: 9632e13c5a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626499

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I01177e764e319b7f6a2ad59a18fe34440a2d66f5
 2021-03-11 08:26:16 +00:00
Lukács T. Berki ee4a95f1b5 Merge "Print a correct error message when a non-hermetic tool is not found." am: a55aefd57b am: d922efecce 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625979

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I97c5791a09f2c456d02109eea4fd944ae7d3fc76
 2021-03-11 08:26:10 +00:00
Lukács T. Berki 6a4cb09496 Merge "Fix the environment of soong_build:" am: 2373e597ea am: 6222fd77f5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625980

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0ebddb4af48b5658737403624c5a9ce1483d218c
 2021-03-11 08:25:54 +00:00
Paul Duffin db284be913 Separate system modules tests into their own file 
java_test.go is getting too big.

Bug: 182402568
Test: m nothing
Change-Id: I9c3818f1d747a230fcb66687319a3a14d557a57c
 2021-03-11 08:21:49 +00:00
Paul Duffin d6c2a65211 prebuilt_apis should create a java_system_modules_import 
Previously it was creating a java_system_modules which worked fine
because apart from the prebuilt nature the two are functionally
identical. However a follow up change will differentiate between them
which would break this code.

Bug: 182402568
Test: m nothing
Change-Id: Ifc13ce31235494e338d730c61a99d8887c5a2c5b
 2021-03-11 08:01:19 +00:00
Lukacs T. Berki 21d5c7aaa9 Hard-wire the path to xcrun as /usr/bin/xcrun. 
This lets us not leak $PATH to soong_build. It was only needed for
Darwin tests anyway.

Test: Will ask jingwen@ who has a Mac.
Change-Id: I4647e41275b323fe6283580f8f92718c6229f23e
 2021-03-11 08:52:39 +01:00
Lukács T. Berki 9632e13c5a Merge "Fix writedocs." am: dfa33be445 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626499

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If2b8770caae1621e09d4efacdfffd8d334ac387c
 2021-03-11 07:52:06 +00:00
Lukács T. Berki d922efecce Merge "Print a correct error message when a non-hermetic tool is not found." am: a55aefd57b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625979

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I299a2ded24a68fb99a95da2341bd8a9ae7f587ea
 2021-03-11 07:51:56 +00:00