Commit Graph

18774 Commits

Author SHA1 Message Date
Roland Levillain 1f355b181d Merge "Remove valgrind-test-art% targets from PARSE_TIME_MAKE_GOALS." am: dbfe39faa2
am: 0e0ffc1053

Change-Id: I91aa17f26b372b301386c880c2ec66821fe6ec6a
2019-03-14 06:36:55 -07:00
Roland Levillain 0e0ffc1053 Merge "Remove valgrind-test-art% targets from PARSE_TIME_MAKE_GOALS."
am: dbfe39faa2

Change-Id: I065fc822abc7b9dda99e1fc83ef32f07a47e8b3a
2019-03-14 06:31:45 -07:00
Roland Levillain dbfe39faa2 Merge "Remove valgrind-test-art% targets from PARSE_TIME_MAKE_GOALS." 2019-03-14 13:17:46 +00:00
Nelson Li fd71578493 Merge "Revert "Revert "Build System: Solve dependency problem for test""" am: 795721ac2a
am: 3c4c86943c

Change-Id: I735cae7b8d68db780eac51868a1ef0fd9b22c5e9
2019-03-13 21:39:07 -07:00
Nelson Li 3c4c86943c Merge "Revert "Revert "Build System: Solve dependency problem for test"""
am: 795721ac2a

Change-Id: Ic5a66836b748dbe18a5b67a55896a0ae041dfc6c
2019-03-13 21:34:55 -07:00
Treehugger Robot 795721ac2a Merge "Revert "Revert "Build System: Solve dependency problem for test""" 2019-03-14 04:23:32 +00:00
Nelson Li 1f8357fe7d Revert "Revert "Build System: Solve dependency problem for test""
This reverts commit 6fe7f194b9.

Reason for revert: Fixed all build break.

Change-Id: I0a4842df1225399752515a4cd7a7c14173a5bf7b
2019-03-14 01:05:36 +00:00
Roland Levillain 43d2ca50ea Remove valgrind-test-art% targets from PARSE_TIME_MAKE_GOALS.
These targets have been removed from ART Makefiles in 2018.

Test: n/a
Bug: 29282211
Bug: 77856586
Change-Id: I00ab00392d153242a67d0764e3ca2ba0528d79db
2019-03-13 17:28:11 +00:00
Xin Li a6d9bd539a Merge "DO NOT MERGE - Merge PPRL.190305.001 into master" 2019-03-13 02:26:04 +00:00
Adam Seaton 11b19b2cd5 Merge "[DO NOT MERGE] Update Platform Security string to 2019-05-05 for Pi-dev Bug:128322951" into pi-dev
am: 53a4d16512

Change-Id: Iab27916732450121d68278e313a28f3507f3895f
2019-03-11 15:42:24 -07:00
Nelson Li 87a4a179e1 Merge "Revert "Build System: Solve dependency problem for test"" am: 8924400a8a
am: abc1617463

Change-Id: Ic24d4cc0fddbc85a273c3050a35a2d09b741fc18
2019-03-11 14:55:42 -07:00
Nelson Li abc1617463 Merge "Revert "Build System: Solve dependency problem for test""
am: 8924400a8a

Change-Id: Ie4a572a1e2d8ab31552b31897d3062c2b7953ce1
2019-03-11 14:21:37 -07:00
Elisa Pascual Trevino 21e7b04729 [DO NOT MERGE] Update Security String to 2019-05-01 in pi-dev Bug: 128322951
am: 1159bb8b17

Change-Id: I6efcc5456bf46cf789c51fbcb87d8ffd15026f5f
2019-03-11 14:14:21 -07:00
Adam Seaton 7d44fc8d59 [DO NOT MERGE] Update Platform Security string to 2019-05-05 for Pi-dev
Bug:128322951
2019-03-11 20:46:28 +00:00
Treehugger Robot 8924400a8a Merge "Revert "Build System: Solve dependency problem for test"" 2019-03-11 20:45:17 +00:00
The Android Open Source Project 9205ecdbba DO NOT MERGE - Merge PPRL.190305.001 into master
Bug: 127812889
Change-Id: I174b936518b6fd2a7687f200478fd63b09bfb860
2019-03-11 11:13:56 -07:00
Elisa Pascual Trevino 1159bb8b17 [DO NOT MERGE] Update Security String to 2019-05-01 in pi-dev
Bug: 128322951
2019-03-11 17:58:20 +00:00
Nelson Li 6fe7f194b9 Revert "Build System: Solve dependency problem for test"
This reverts commit 224e103308.

Reason for revert: Build Breakage in git_pi-dev-plus-aosp/docs @5366136
make -j110 docs showcommands dist DIST_DIR=/buildbot/dist_dirs/git_pi-dev-plus-aosp-linux-docs/5366136 checkbuild
FAILED:
 Dependencies in out found with no rule to create them:
 out/target/product/generic/data/app/CtsVerifierTester/CtsVerifierTester.apk
 out/target/product/generic/data/app/TradeFedTestApp/TradeFedTestApp.apk
 out/target/product/generic/data/app/TradeFedUiTestApp/TradeFedUiTestApp.apk
 15:53:46 stopping
and
make -j50 showcommands dist TARGET_PRODUCT=cf_x86_phone DIST_DIR=/buildbot/dist_dirs/git_master-linux-ndk_translation_all/5366149 ndk_translation_all
FAILED: ninja: 'out/target/product/vsoc_x86/data/nativetest/arm/arm_insn_tests_arm_static/arm_insn_tests_arm_static', needed by 'out/target/product/vsoc_x86/obj/PACKAGING/ndk_translation_tests_intermediates/arm_insn_tests_arm_static_result.xml', missing and no known rule to make it
15:55:38 ninja failed with: exit status 1
make: *** [run_soong_ui] Error 1
Return Code: 2

Change-Id: Idf95ef2e06526a0a31690420c923207db627605f
2019-03-11 16:48:29 +00:00
nelsonli 6e62c0bdaa Merge "Build System: Solve dependency problem for test" am: 15e76e3848
am: 740ac49c83

Change-Id: I770273ff9ad1e0444085d4222a692b7cb455041d
2019-03-11 08:30:24 -07:00
nelsonli 740ac49c83 Merge "Build System: Solve dependency problem for test"
am: 15e76e3848

Change-Id: I3196c19640d92e72f947c45925969845f63daeb4
2019-03-11 08:26:14 -07:00
Treehugger Robot 15e76e3848 Merge "Build System: Solve dependency problem for test" 2019-03-11 15:18:12 +00:00
android-build-team Robot 0b004435b8 Make change and version bump to PPRL.190305.001
Change-Id: I406ab6822fab34684fdbc84ad264106ae3dbec3b
2019-03-08 18:53:29 +00:00
Nicolas Geoffray c6b7b2cdae Merge "Add a flag to select the apex boot image for preopt." am: b82b26456b
am: e39cf6a200

Change-Id: I1e68ea0dc1b75216b4d1613b1db7425525dde71c
2019-03-08 10:16:19 -08:00
Nicolas Geoffray e39cf6a200 Merge "Add a flag to select the apex boot image for preopt."
am: b82b26456b

Change-Id: I36baf7040c04428f53fb373f7391ac5e0b65a4e0
2019-03-08 10:11:11 -08:00
Treehugger Robot b82b26456b Merge "Add a flag to select the apex boot image for preopt." 2019-03-08 17:33:51 +00:00
Nicolas Geoffray 19abe716f8 Add a flag to select the apex boot image for preopt.
Test: m && check that odex files are preopted with the apex image
Bug: 119800099
Change-Id: I5b64261cd765b511ad7e1ff513b85c0579023f6e
2019-03-08 14:41:14 +00:00
Dan Willemsen 8933fed367 Merge "Fix `m snod`" am: 04f2896c88
am: 28ac0cd338

Change-Id: I21a95be55dd14d409ad734d495c43f91d4017ccd
2019-03-08 00:14:56 -08:00
Dan Willemsen 28ac0cd338 Merge "Fix `m snod`"
am: 04f2896c88

Change-Id: Ie752f16d4dbf576df3329d87612ac2f6b2ac638b
2019-03-08 00:11:07 -08:00
Dan Willemsen 283aa265d7 Merge changes from topic "HOST_PACKAGES" am: 066da0c58b
am: 75720c81aa

Change-Id: Id025085288ec317e035535819b701ba95b298bf7
2019-03-07 17:52:27 -08:00
Dan Willemsen e314eeb918 Reland "First pass at creating PRODUCT_HOST_PACKAGES" am: 3d05a08a6f
am: 87d763b9f4

Change-Id: Idccfb845dd73bff320d6593e736386125dd8e477
2019-03-07 17:51:34 -08:00
Dan Willemsen c478ea3dac Fix `m snod`
Whenever we're not loading all makefiles, we shouldn't be checking that
all the host packages exist.

Test: m snod
Change-Id: If1f817d855cbe329b83caee9fdd68c2cce55f02b
2019-03-07 17:18:15 -08:00
Dan Willemsen 75720c81aa Merge changes from topic "HOST_PACKAGES"
am: 066da0c58b

Change-Id: I9600129b255f1ef16880a217aeeac60622aab571
2019-03-07 17:07:33 -08:00
Dan Willemsen 87d763b9f4 Reland "First pass at creating PRODUCT_HOST_PACKAGES"
am: 3d05a08a6f

Change-Id: Ifc134f514dbcfc28e33eb82b2a77514cc4af26b6
2019-03-07 17:06:23 -08:00
Dan Willemsen 066da0c58b Merge changes from topic "HOST_PACKAGES"
* changes:
  Build everything in PRODUCT_HOST_PACKAGES
  Reland "First pass at creating PRODUCT_HOST_PACKAGES"
2019-03-08 00:21:01 +00:00
Tri Vo 34f72c8e30 Merge "recovery: install product_file_contexts and product_property_contexts" am: 9f18c64d07
am: 6a03c1677b

Change-Id: Ib45350461ff21edcb42c65b089183bd157e945f2
2019-03-07 12:06:57 -08:00
Tri Vo 6a03c1677b Merge "recovery: install product_file_contexts and product_property_contexts"
am: 9f18c64d07

Change-Id: If303af03aed7453c4cacfba21b13debc2bd7dcff
2019-03-07 11:58:25 -08:00
Tri Vo 9f18c64d07 Merge "recovery: install product_file_contexts and product_property_contexts" 2019-03-07 18:32:48 +00:00
nelsonli 224e103308 Build System: Solve dependency problem for test
1. A test can add a runtime dependent test module by just setting
   LOCAL_REQUIRED_MODULES or LOCAL_TARGET_REQUIRED_MODULES. Then the dependent test
   module will be copied to testcase folder.
2. Do not install to $(TARGET_OUT_DATA) for testcase

BUG: 117224272

Test: 1. (a) vi cts/tests/tests/text/Android.mk
         (b) add LOCAL_REQUIRED_MODULES := CtsPrintTestCases
         (c) m -j CtsTextTestCases
         (d) Then, CtsPrintTestCases should also be built to testcase folder like below.
             ./target/product/generic_arm64/testcases/CtsPrintTestCases

Change-Id: I24ea3783486c54a05cfa9d3d0375b977afc230f8
2019-03-07 14:08:35 +08:00
Dan Willemsen b952b5e4c3 Build everything in PRODUCT_HOST_PACKAGES
This should only add extra host packages that were in
PRODUCT_HOST_PACKAGES and not PRODUCT_PACKAGES.

That shouldn't be very many things -- user builds will build a few more
host tools that used to be in PRODUCT_PACKAGES_DEBUG, etc.

Test: treehugger
Change-Id: I6768b76db74ea049de90eef326d1e314eb4ef848
Merged-In: I6768b76db74ea049de90eef326d1e314eb4ef848
2019-03-06 15:41:19 -08:00
Dan Willemsen 3d05a08a6f Reland "First pass at creating PRODUCT_HOST_PACKAGES"
Adds icu-data_host_runtime_apex to fix unbundled builds which pull it in
via PRODUCT_PACKAGES, but are missing packages that would pull it in via
PRODUCT_HOST_PACKAGES.

Test: build/soong/build_test.bash
Test: in ub-timezonedata-master; tapas TimeZoneData; m
Change-Id: I1583c7582b386c3e8478711cb1df340518d763c1
Merged-In: I1583c7582b386c3e8478711cb1df340518d763c1
2019-03-06 14:46:06 -08:00
Colin Cross 51fea3d3b4 Merge "Update manifest merger to use binary" am: e34ff5ca5d
am: 9c6a64ea64

Change-Id: I40bcbe199fd4837eededddfa03069015b536f04b
2019-03-04 14:20:35 -08:00
Colin Cross 9c6a64ea64 Merge "Update manifest merger to use binary"
am: e34ff5ca5d

Change-Id: I0e10784282edb4394c192ffe5b177023d5d72832
2019-03-04 14:13:27 -08:00
Colin Cross e34ff5ca5d Merge "Update manifest merger to use binary" 2019-03-04 22:02:09 +00:00
Nicolas Geoffray 05cee18432 Merge "Pass the --api-flags to appcompat explicitly." am: 53cfd9275b
am: 40ccefa404

Change-Id: I73e4cc646241347a2df188a1a610d9effcc673c9
2019-03-04 06:27:48 -08:00
Nicolas Geoffray 40ccefa404 Merge "Pass the --api-flags to appcompat explicitly."
am: 53cfd9275b

Change-Id: I1bb503a1140c6d3877280c6073710bd9b5ffb61a
2019-03-04 06:23:38 -08:00
Nicolas Geoffray 53cfd9275b Merge "Pass the --api-flags to appcompat explicitly." 2019-03-04 14:14:39 +00:00
Julien Desprez 0e0ef29e9f Merge "Add a placeholder EXTRA_OPTIONS to inject more tradefed options" am: 20a50f75a3
am: cab4032f3c

Change-Id: Idd4cd181e0106cb97c216385dd166211332cab10
2019-03-01 17:15:03 -08:00
Julien Desprez cab4032f3c Merge "Add a placeholder EXTRA_OPTIONS to inject more tradefed options"
am: 20a50f75a3

Change-Id: Icf8f52e2aad12157daf3b967b6afa606dc7e0366
2019-03-01 17:00:15 -08:00
Julien Desprez 4e9a9485f4 Add a placeholder EXTRA_OPTIONS to inject more tradefed options
Simply remove the placeholder in makefiles, for now I am
not sure we need to support this in makefiles at all.

Test: call the sed method
Bug: 124024827
Change-Id: Iae78ae86c20c5da6b7314b749f54983a312c4a7d
2019-03-01 11:36:36 -08:00
Yifan Hong 934174f0bd Merge "Build ODM manifests and fragments for each SKU." am: 5a4696e460
am: 9abd15f3c1

Change-Id: Iba0f554d1430962752f5fa6425f3ad671d2a99b2
2019-03-01 10:55:04 -08:00