Commit Graph

49635 Commits

Author SHA1 Message Date
Baligh Uddin
eb5af6fa98 Merge changes I3fa13e3d,I7b7f0017,I2ef318e0
am: 0573298a18

Change-Id: I89a00b65ec6c9c44ccd0d43eda6c9f8049749f04
2019-03-17 11:54:41 -07:00
Baligh Uddin
0573298a18 Merge changes I3fa13e3d,I7b7f0017,I2ef318e0
* changes:
  releasetools: Support signing APEXes.
  releasetools: Add apex_utils.py.
  releasetools: check_target_files_signatures.py checks APEXes.
2019-03-17 18:49:48 +00:00
Tao Bao
aa7e993a22 releasetools: Support signing APEXes.
Bug: 123716522
Test: Run sign_target_files_apks.py to sign a target_files with APEXes.
Test: Run check_target_files_signatures.py on signed artifact.
Test: python -m unittest test_sign_target_files_apks
Change-Id: I3fa13e3d9461cf5e0838e0572d436e218164fe41
2019-03-15 22:15:51 -07:00
Tao Bao
1cd59f2a26 releasetools: Add apex_utils.py.
The added `testdata/testkey_with_passwd.key` is generated with:

$ openssl pkcs8 -inform DER -in testdata/testkey_with_passwd.pk8 \
    -out testdata/testkey_with_passwd.key -passin pass:foo

Bug: 123716522
Test: python -m unittest test_apex_utils
Change-Id: I7b7f00178ecab35c3e41ecf4d10295fe9bf480ab
2019-03-15 22:08:42 -07:00
Tao Bao
d8469727bc releasetools: check_target_files_signatures.py checks APEXes.
Only the container certs will be checked and reported. For the payload
within an APEX, we can't easily extract the cert info.

It needs to go along a longer path, if ever needed, by:
 - extracting public keys from all the available certs;
 - using each of them to verify against an APEX payload to find a match
   (`avbtool verify_image --image payload --key public_key`).

Bug: 123716522
Test: Run check_target_files_signatures.py on target_files with APEXes.
Change-Id: I2ef318e05433d2d65ab84e2dff9e01fb6ee3373d
2019-03-15 20:56:13 -07:00
Tao Bao
3f759a23ce Merge changes I1f645008,Ic68c019f
am: 015f83137d

Change-Id: I20ae63c891848d0426259b066265e7423a7ed5c8
2019-03-15 20:47:13 -07:00
Tao Bao
015f83137d Merge changes I1f645008,Ic68c019f
* changes:
  releasetools: Add common.ExtractAvbPublicKey().
  releasetools: Initalize logger when signing.
2019-03-16 03:38:07 +00:00
Benjamin Gordon
b3a6164a9b Merge "Add stoney ridge x86 variant"
am: 8c2881034a

Change-Id: I43d012b9755e593b3b5c34c88254b51b52f63201
2019-03-15 15:33:32 -07:00
Treehugger Robot
8c2881034a Merge "Add stoney ridge x86 variant" 2019-03-15 21:41:32 +00:00
Tao Bao
2cc0ca1770 releasetools: Add common.ExtractAvbPublicKey().
Bug: 123716522
Test: python -m unittest test_common
Change-Id: I1f645008a14cc882ef280f169c36e4b14a53ef88
2019-03-15 10:47:46 -07:00
Tao Bao
badceb2d60 releasetools: Initalize logger when signing.
Other modules have switched to logging module. sign_target_files_apks.py
needs to init the logger to get the logs.

Test: Run `sign_target_files_apks.py -v`. Check outputs.
Test: Run `check_target_files_signatures.py -v`.
Change-Id: Ic68c019f6fb14840561885f1194ad6efdfdb7d82
2019-03-15 09:53:00 -07:00
Tao Bao
f740f57ca8 Merge "Include charger.recovery for recovery."
am: bc2f9ce2c1

Change-Id: I438b1f645bcc6e9021284e9839bc9a1ee06f1b52
2019-03-14 10:05:51 -07:00
Tao Bao
bc2f9ce2c1 Merge "Include charger.recovery for recovery." 2019-03-14 16:56:29 +00: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
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
Chih-hung Hsieh
eb617633aa Merge "Accept the "file:(project:)?filePath" directive."
am: cda227eeaf

Change-Id: I977f161f5879573bdcbe415fb25b2e994ba25d7e
2019-03-13 14:02:07 -07:00
Chih-hung Hsieh
cda227eeaf Merge "Accept the "file:(project:)?filePath" directive." 2019-03-13 20:47:10 +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
ea1d10caec [automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into master"
am: a6d9bd539a -s ours
am skip reason: subject contains skip directive

Change-Id: I527748e396058eb3f8d9ac20a3b4916265c9e1c7
2019-03-12 21:55:40 -07:00
The Android Open Source Project
27479f1f30 [automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master
am: 9205ecdbba -s ours
am skip reason: subject contains skip directive

Change-Id: Ie31f927cabd00222764e82c87270e51ba2e93aa5
2019-03-12 21:21:32 -07:00
Xin Li
a6d9bd539a Merge "DO NOT MERGE - Merge PPRL.190305.001 into master" 2019-03-13 02:26:04 +00:00
Chih-Hung Hsieh
cc47729719 Accept the "file:(project:)?filePath" directive.
Test: checkowners.py some_owner_files
Bug: 126777637
Bug: 126761563
Change-Id: Iee03521681bc38fa28970a015058e1eba3c8b87a
2019-03-12 11:56:33 -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
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
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
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
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
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
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
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
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
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