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
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
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
SzuWei Lin
81a3f0f4de
Merge "Fix some system property missing problem on aosp_* targets" am: bc1e820f25
am: 37e3fd9887
...
am: c72c066545
Change-Id: If5d6dc33cddb8dc1b72c39ad59d1a5b6d48b2b05
2019-03-11 09:50:12 -07: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
6e17758737
Merge "Build System: Solve dependency problem for test" am: 15e76e3848
am: 740ac49c83
...
am: 6e62c0bdaa
Change-Id: Ic1786c6b153ab105400aa1e2c78101fa288ee913
2019-03-11 08:34:40 -07: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
6aab484c57
[automerger skipped] DO NOT MERGE - Skip PPRL.190305.001 into stage-aosp-master am: c4550058a8
-s ours
...
am: 44792e9411
-s ours
am skip reason: subject contains skip directive
Change-Id: Iafeb5a4bd19a3b07314067470b2e1ebae05da626
2019-03-08 18:41:06 -08: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
TreeHugger Robot
3a6a7f8055
Merge "Move mediaswcodec process to apex"
2019-03-08 19:46:28 +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
5b21467008
Merge "Add a flag to select the apex boot image for preopt." am: b82b26456b
am: e39cf6a200
...
am: c6b7b2cdae
Change-Id: Ic596bf67c1885e6bff4f64096b8fbc506fb327e8
2019-03-08 10:45:06 -08: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
d64328f3a5
Merge "Fix m snod
" am: 04f2896c88
am: 28ac0cd338
...
am: 8933fed367
Change-Id: Iee059a8de36866e6fb17cc255548b404e3990143
2019-03-08 00:19:25 -08: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
80c608b0da
[automerger skipped] Merge changes from topic "HOST_PACKAGES" am: 066da0c58b
am: 75720c81aa
...
am: 283aa265d7
-s ours
am skip reason: change_id I6768b76db74ea049de90eef326d1e314eb4ef848 with SHA1 51e3b38508
is in history
Change-Id: I85917bc9566aed24e55e84db5755a76f1be2b18e
2019-03-07 18:47:08 -08:00
Dan Willemsen
ae69ce4bae
[automerger skipped] Reland "First pass at creating PRODUCT_HOST_PACKAGES" am: 3d05a08a6f
am: 87d763b9f4
...
am: e314eeb918
-s ours
am skip reason: change_id I1583c7582b386c3e8478711cb1df340518d763c1 with SHA1 4a70a19f84
is in history
Change-Id: I5e55ef1704a2d89929df03bcda86089927152de5
2019-03-07 18:45:54 -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
3daf07b548
Merge "recovery: install product_file_contexts and product_property_contexts" am: 9f18c64d07
am: 6a03c1677b
...
am: 34f72c8e30
Change-Id: I402c8ca7817ed2beee28e7949dc8e8e8dbd10f74
2019-03-07 12:25:36 -08: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
Tao Bao
f05a054ce3
Merge "releasetools: Include retrofit info into package metadata." am: 28a11ef040
am: dff72247d8
...
am: 5242934a9c
Change-Id: I5b6900e9fcfcccfbb1a252c65a18c4ac602825de
2019-03-07 12:06:08 -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
Tao Bao
5242934a9c
Merge "releasetools: Include retrofit info into package metadata." am: 28a11ef040
...
am: dff72247d8
Change-Id: Ic9c4871120655fb7cff0c1cd5d1e267fee03a193
2019-03-07 11:27:36 -08:00
Tao Bao
dff72247d8
Merge "releasetools: Include retrofit info into package metadata."
...
am: 28a11ef040
Change-Id: I76c8f757efea6bb2ce8d0dc084083e5c8f6f6bc6
2019-03-07 11:04:35 -08:00
Tri Vo
9f18c64d07
Merge "recovery: install product_file_contexts and product_property_contexts"
2019-03-07 18:32:48 +00:00