Commit Graph

49851 Commits

Author SHA1 Message Date
Daniel Norman 186ae7abb2 Merge "Adds support for optional config files to configure the merge." am: cf9509df01
am: f03c76d047

Change-Id: Idfd4ff85e6d9c0ab9b80e2e5455890c7f724c150
2019-03-12 10:11:22 -07:00
Daniel Norman f03c76d047 Merge "Adds support for optional config files to configure the merge."
am: cf9509df01

Change-Id: I67c1b99c582027e9993d9fe92acb94b4a66b80cd
2019-03-12 10:07:13 -07:00
Daniel Norman cf9509df01 Merge "Adds support for optional config files to configure the merge." 2019-03-12 16:53:31 +00:00
Daniel Norman 2c99c5bbd2 Adds support for optional config files to configure the merge.
Bug: 124467065
Test: Running `python merge_target_files.py` using the three new flags
and observing that their contents are passed to the merge_target_files() function.
Change-Id: I4de46f041f5ae8bc8be2730313ce873a952bf78e
2019-03-12 16:51:18 +00:00
Remi NGUYEN VAN 3ea98a1d22 Merge "Move NetworkStack in-process from lib to APK" am: c6bf520424
am: 0dda351bf0

Change-Id: Ieec10d691d22c89135eb1a29cc4122bc6f373dc6
2019-03-11 19:00:22 -07:00
Remi NGUYEN VAN 0dda351bf0 Merge "Move NetworkStack in-process from lib to APK"
am: c6bf520424

Change-Id: I54fc8f10f22ae4fd45522224ac2351198df4e4f2
2019-03-11 18:49:10 -07:00
Remi NGUYEN VAN c6bf520424 Merge "Move NetworkStack in-process from lib to APK" 2019-03-12 01:37:26 +00:00
Adam Seaton 520b6c9fe6 [automerger skipped] [Do Not Merge] Update Platform Security String to 2019-05-05 for oc-mr1-dev Bug:128322951 am: 796d90c141 -s ours
am: 3d75a015a2

Change-Id: Ia14117c1d2730bd46cf6cc6c050682c9855096a4
2019-03-11 16:03:18 -07:00
Adam Seaton 3d75a015a2 [automerger skipped] [Do Not Merge] Update Platform Security String to 2019-05-05 for oc-mr1-dev Bug:128322951
am: 796d90c141 -s ours
am skip reason: subject contains skip directive

Change-Id: I088058f32b6e2a990e1f4f6db432ed74adde43a6
2019-03-11 15:52:56 -07: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
TreeHugger Robot 53a4d16512 Merge "[DO NOT MERGE] Update Platform Security string to 2019-05-05 for Pi-dev Bug:128322951" into pi-dev 2019-03-11 22:31:32 +00: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 9e6ce604c0 [automerger skipped] [DO NOT MERGE] Update Security String to 2019-05-01 in oc-mr1-dev Bug: 128322951 am: 801e91776e -s ours
am: d6e24caa47

Change-Id: I48c17bae57cf7241bd1690fea04ee448512200ce
2019-03-11 14:15:03 -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
Elisa Pascual Trevino d6e24caa47 [automerger skipped] [DO NOT MERGE] Update Security String to 2019-05-01 in oc-mr1-dev Bug: 128322951
am: 801e91776e -s ours
am skip reason: subject contains skip directive

Change-Id: Ia74fdd88bdd94c15f639685615ae4700f44fa870
2019-03-11 14:12:07 -07:00
Pavel Salomatov 9a5bc48596 Merge "releasetools: Add compatibility for custom out directory." am: b6f2f8b2d9
am: 0c470d3b8c

Change-Id: I984e29ff580ed1c361f22a7357c53dd4a24961c3
2019-03-11 14:11:35 -07:00
Adam Seaton 796d90c141 [Do Not Merge] Update Platform Security String to 2019-05-05 for oc-mr1-dev
Bug:128322951
2019-03-11 20:50:55 +00: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
Pavel Salomatov 0c470d3b8c Merge "releasetools: Add compatibility for custom out directory."
am: b6f2f8b2d9

Change-Id: I93b394aed846563a54a9c83a3705f91ffbc2cc01
2019-03-11 13:14:37 -07:00
Treehugger Robot b6f2f8b2d9 Merge "releasetools: Add compatibility for custom out directory." 2019-03-11 19:51:14 +00:00
Elisa Pascual Trevino 801e91776e [DO NOT MERGE] Update Security String to 2019-05-01 in oc-mr1-dev
Bug: 128322951
2019-03-11 18:06:15 +00: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
SzuWei Lin c72c066545 Merge "Fix some system property missing problem on aosp_* targets" am: bc1e820f25
am: 37e3fd9887

Change-Id: If5ba2daf3cfb1e0bbd7b214b766b10cda9ce7b01
2019-03-11 09:37:23 -07:00
SzuWei Lin 37e3fd9887 Merge "Fix some system property missing problem on aosp_* targets"
am: bc1e820f25

Change-Id: I1e89dbe2a5b1630558257c3a2f15f477c15027db
2019-03-11 09:23:33 -07:00
Pavel Salomatov 3267655004 releasetools: Add compatibility for custom out directory.
sign_target_files_apks script looks for the signapk.jar inside the out dir.
If the our dir is set to a different directory via OUT_DIR_COMMON_BASE the script does not work properly.

From now script checks if the OUT_DIR_COMMON_BASE is set, then searches the jar in the proper path.
If OUT_DIR_COMMON_BASE is unset, searches in "out" like it did before.

Test: Build with OUT_DIR_COMMON_BASE set and unset and verify that sign_target_files_apks works in both cases

Change-Id: I9218b98ff79526184f8353705640193405afac9e
2019-03-11 19:22:29 +03:00
Treehugger Robot bc1e820f25 Merge "Fix some system property missing problem on aosp_* targets" 2019-03-11 16:10:22 +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
The Android Open Source Project 44792e9411 [automerger skipped] DO NOT MERGE - Skip PPRL.190305.001 into stage-aosp-master
am: c4550058a8 -s ours
am skip reason: subject contains skip directive

Change-Id: I86adfd9fb0c0e1ee303614dcbcc3213f429c8a2e
2019-03-08 18:24:18 -08:00
The Android Open Source Project c4550058a8 DO NOT MERGE - Skip PPRL.190305.001 into stage-aosp-master
Bug: 127812889
Change-Id: I81a7ba13d0738e92d3eef9b72ea82caf32501076
2019-03-08 15:57:31 -08: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
SzuWei Lin ace19f63fe Fix some system property missing problem on aosp_* targets
Some PRODUCT_PROPERTY_OVERRIDES has no effect, ex.
ro.dalvik.vm.native.bridge=0 in runtime_libart.mk,
because gsi_common.mk uses ':=', not '+='.

Bug: 125829345
Test: build aosp_arm64-userdebug
Test: check the properties in /vendor/build.prop
Change-Id: Ib5e026069e7919fed8a00f905f3dbaa15042107f
2019-03-08 18:16:54 +08:00
Remi NGUYEN VAN e6fcb468d8 Move NetworkStack in-process from lib to APK
This makes the in-process configuration closer to the "standard" module
configuration, by using an APK in both cases, but making sure that
svelte builds use an in-process service to avoid the memory impact.

Bug: 127908503
Test: svelte build boots and has functional WiFi
Change-Id: I59f44df7c23a24429e9fe6be034260373e33a994
2019-03-08 17:42:59 +09: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
Treehugger Robot 04f2896c88 Merge "Fix `m snod`" 2019-03-08 07:59:33 +00: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