Commit Graph

39284 Commits

Author SHA1 Message Date
Tao Bao a198b1e964 releasetools: Validate A/B OTA payload signatures.
$ PYTHONPATH=$PYTHONPATH:system/update_engine/scripts \
    ./build/make/tools/releasetools/check_ota_package_signature.py \
    build/target/product/security/testkey.x509.pem \
    out/dist/aosp_marlin-ota-eng.zip

Package: out/dist/aosp_marlin-ota-eng.zip
Certificate: build/target/product/security/testkey.x509.pem
...
Whole package signature VERIFIED

Verifying A/B OTA payload signatures...
...
Payload signatures VERIFIED

Bug: 65261072
Test: Signed a package and its payload with the right keys; ran the
      command above.
Test: Signed the payload with a different key; ran the command above and
      observed the reported verification failure.
Change-Id: If626ecb327a9826cd0956eef94914c939068a7d1
2017-09-01 14:33:15 -07:00
Tao Bao 5b8e0ffaf9 Merge "Pack system/update_engine/scripts into otatools.zip." am: 27bfc86d8b
am: cdfabdbf85

Change-Id: Ifbf47be3c9330fb984907b257612b2f7b9f25d2f
2017-09-01 17:00:12 +00:00
Tao Bao cdfabdbf85 Merge "Pack system/update_engine/scripts into otatools.zip."
am: 27bfc86d8b

Change-Id: I9899eb544f48e4556117b4c83153a76a3ef72cb9
2017-09-01 16:54:07 +00:00
Tao Bao 27bfc86d8b Merge "Pack system/update_engine/scripts into otatools.zip." 2017-09-01 16:45:08 +00:00
Miodrag Dinic 0297f39904 Fix mips emulator boot
The following commit introduced regression:
    7b5e1ab emulator: squash misc modifications from oc-emu-dev

Emulators for mips should also use unencrypted data partition like arm.
Encryption is only enabled for Intel.

Change-Id: I3dba08621d8f679a707f516fff735bba31bfc629
Signed-off-by: Miodrag Dinic <miodrag.dinic@imgtec.com>
2017-09-01 17:07:28 +02:00
Sundong Ahn 43e711962e configstore: remove configstore 1.1
Configstore was down-revisioned from 1.1 to 1.0 in oc-dr1-dev,
oc-mr1-dev and oc-mr1-dev-plus-aosp. Therefore configstore in
oc-dr1-dev-plus-aosp will also be down-revisioned to 1.0.

Bug: 65124635
Test: build & boot test on sailfish + walleye
Change-Id: Ife60328110c6d6cb3e8024fb4a5caabc4c7c034f
Merged-In: I90d30584ad4499d4e20254be2974d9de1d3883c0
2017-09-01 05:38:25 +00:00
Bo Hu d6a91a6a10 Merge "sdk: add vendor-qem.img into the deps list" am: cfde9a84bc
am: 1d59beefeb

Change-Id: I8e1253abf8baf627c0dd74935395b056d644d8c9
2017-09-01 00:28:46 +00:00
Nan Zhang 5d52f85261 Merge changes from topic "turbine" am: 872246de0f
am: fa8b66f5cc

Change-Id: Ida5ba29574e8aaf8ac3c63b243c42f4a1c7dc5b9
2017-09-01 00:27:40 +00:00
Steve Fung c6ece010e4 Merge "Only generate breakpad symbols for ELF binaries" am: 14f225b762
am: 55b7eb41a8

Change-Id: Ie14081c34d87266bd1ab46cf682145717c0bb517
2017-09-01 00:25:01 +00:00
Bo Hu 1d59beefeb Merge "sdk: add vendor-qem.img into the deps list"
am: cfde9a84bc

Change-Id: I7d28167ff9578ad8c8dc73a4d8a6d9252cfb2cfb
2017-09-01 00:24:57 +00:00
Bo Hu 6268f7c752 Merge changes from topic "aosp-emulator-oc" am: 35149ca0b7 -s ours
am: 8c5471250e

Change-Id: Ia7ed839c80df01d7c5c22e56a88c34e9a3789222
2017-09-01 00:22:52 +00:00
Nan Zhang fa8b66f5cc Merge changes from topic "turbine"
am: 872246de0f

Change-Id: I13cba047e145d0ab8c486a4ee60d53f2f5470737
2017-09-01 00:21:34 +00:00
Steve Fung 55b7eb41a8 Merge "Only generate breakpad symbols for ELF binaries"
am: 14f225b762

Change-Id: I629664d415422bbfd40cfe026970b8738acb31da
2017-09-01 00:20:41 +00:00
Bo Hu 8c5471250e Merge changes from topic "aosp-emulator-oc"
am: 35149ca0b7  -s ours

Change-Id: I3fd071590dcb08000b6b6a9666280c35fe6389c8
2017-09-01 00:17:54 +00:00
Bo Hu cfde9a84bc Merge "sdk: add vendor-qem.img into the deps list" 2017-09-01 00:07:48 +00:00
Treehugger Robot 872246de0f Merge changes from topic "turbine"
* changes:
  Revert "Revert "Add Turbine as part of java build toolchain in Make.""
  Remove GLOBAL_JAVAC_DEBUG_FLAGS
2017-09-01 00:01:31 +00:00
bohu 18d1868580 sdk: add vendor-qem.img into the deps list
if it exists. Fix master-without-vendor sdk_x86-sdk build

Change-Id: I5656e7124d30e71120044cce668c54793f77208a
Merged-In: I5656e7124d30e71120044cce668c54793f77208a
(cherry picked from commit a508578811)
2017-08-31 16:57:44 -07:00
Tao Bao 3f4ea7cb88 Pack system/update_engine/scripts into otatools.zip.
The scripts will be needed by OTA releasetools, for parsing A/B OTA
payload.

Bug: 65261072
Test: `m otatools-package` and check for system/update_engine/scripts.
Change-Id: I5cb54561a5fb0454a37879ca20afa95b82ffdefe
2017-08-31 16:42:38 -07:00
Treehugger Robot 14f225b762 Merge "Only generate breakpad symbols for ELF binaries" 2017-08-31 23:37:41 +00:00
Steve Fung 445beae409 Only generate breakpad symbols for ELF binaries
When BREAKPAD_GENERATE_SYMBOLS is set to true, the build will attempt
to run dump_syms for all dynamic binaries.  However some build targets
are now using cc_prebuilt_binary for installing python host scripts.
This causes dump_syms to return an error, causing the build to fail.
So check instead if the file is an ELF binary before running dump_syms.

Bug: 65065674
Test: Built AT target successfully.
Merged-In: Ibe7d3ebd312376600cf21efa111489451a4e7578
Change-Id: Ibe7d3ebd312376600cf21efa111489451a4e7578
(cherry picked from commit ee848655db)
2017-08-31 15:57:44 -07:00
Bo Hu 35149ca0b7 Merge changes from topic "aosp-emulator-oc"
* changes:
  emulator: fix widevine drm vndbinder denial
  emulator: fix selinux issues
  emulator: squash misc modifications from oc-emu-dev
  emualtor: keep libopenjdkjvmti*.so on sdk images
  emulator: move rild.libpath to vendor
  sdk:enable emulator to launch in build environment
  build-emulator: fully treblize emulator image
  Build vendor image for emulator
2017-08-31 22:56:31 +00:00
Lev Rumyantsev 76e2b22796 Merge "Move default native bridge value to build.prop" am: e7a0516835
am: 77492a72a2

Change-Id: I40565e0df3718cb326b810a59372e4ebdaeeadf7
2017-08-31 22:20:58 +00:00
Lev Rumyantsev 77492a72a2 Merge "Move default native bridge value to build.prop"
am: e7a0516835

Change-Id: I34f92daf8fade009b524505e51d162a78d205ac3
2017-08-31 22:16:56 +00:00
Treehugger Robot e7a0516835 Merge "Move default native bridge value to build.prop" 2017-08-31 22:08:29 +00:00
Nan Zhang b3ec534bd1 Revert "Revert "Add Turbine as part of java build toolchain in Make.""
This reverts commit 33dcd0c5eb.

Reason for revert: <stub.jar.toc needs classes.jar.toc which is no longer existed after Turbine was introduced. So use classes.jar to represent stub.jar.toc>

Bug: b/64308460
Test: m clean && time m -j32 ANDROID_COMPILE_WITH_JACK=true
Change-Id: If618993f1e0c789d93cc15664212603f994fd460
2017-08-31 14:56:54 -07:00
Colin Cross 9a594e05af Remove GLOBAL_JAVAC_DEBUG_FLAGS
GLOBAL_JAVAC_DEBUG_FLAGS is no longer set, -g is already included
in the javac command line.  Jack is on its way out, just use -g
directly there for now.

Test: m -j checkbuild
Change-Id: Ib99c248bbb8b65fa2cd2b55449a502fc20deffa8
2017-08-31 14:48:31 -07:00
Nan Zhang 40403cdded Merge "Revert "Add Turbine as part of java build toolchain in Make."" am: 91ffbf2fbe
am: 2c82a22d96

Change-Id: If411e98819ef75f762ea764b65b1483d509e30dc
2017-08-31 20:44:25 +00:00
Nan Zhang 2c82a22d96 Merge "Revert "Add Turbine as part of java build toolchain in Make.""
am: 91ffbf2fbe

Change-Id: I1a1131df064f2243220407dddd3f913ace7d26aa
2017-08-31 20:41:25 +00:00
Nan Zhang 91ffbf2fbe Merge "Revert "Add Turbine as part of java build toolchain in Make."" 2017-08-31 20:32:46 +00:00
Jeff Gaston 1923a31e9c Merge "Implement LOCAL_TARGET_REQUIRED_MODULES" am: 2c0442238b
am: d7fe023444

Change-Id: I5eba9ee04a9af912738f6aece2cdebebcf245ee6
2017-08-31 20:26:19 +00:00
Jeff Gaston d7fe023444 Merge "Implement LOCAL_TARGET_REQUIRED_MODULES"
am: 2c0442238b

Change-Id: Ifb9dccdde667dbbbe93bf9626fd9e0cf9f5f3152
2017-08-31 20:22:49 +00:00
Jeff Gaston 2c0442238b Merge "Implement LOCAL_TARGET_REQUIRED_MODULES" 2017-08-31 20:14:01 +00:00
Nan Zhang 33dcd0c5eb Revert "Add Turbine as part of java build toolchain in Make."
This reverts commit 0739155c86.

Reason for revert: <sdk_google_aw_x86-sdk (linux) build 4310016 in git_master is broken>

Change-Id: I525d48557bd0425917e61a85f596663ccc63c887
2017-08-31 19:56:59 +00:00
Lev Rumyantsev be80acfd1a Move default native bridge value to build.prop
Before this change it was part of default.prop, which is applied
before init.rc is executed, so that scripts cannot override the property.

In contrast, build.prop is applied at "init-late" stage,
so that one has a chance to override the property in scripts using
"init" or "init-early" triggers.

(cherry-picked from 74b2da9db67f5da2195c9b07dab22c868934e396)

Test: fugu still works
Bug: 63133475
Merged-In: I0842abaaec1d353ebe4debda6dfe3e2c42146786
Change-Id: I0842abaaec1d353ebe4debda6dfe3e2c42146786
2017-08-31 12:13:37 -07:00
Nan Zhang 3c30f84e2d Merge "Add Turbine as part of java build toolchain in Make." am: 0b23748128
am: 2764a16085

Change-Id: I4dde20154f3fffcf28e9d342ede9563994b79217
2017-08-31 18:19:47 +00:00
Nan Zhang 2764a16085 Merge "Add Turbine as part of java build toolchain in Make."
am: 0b23748128

Change-Id: Ieed94b471fea95b91b7bc54da8d3860cb794f921
2017-08-31 18:16:13 +00:00
Nan Zhang 0b23748128 Merge "Add Turbine as part of java build toolchain in Make." 2017-08-31 18:01:43 +00:00
Andreas Gampe a3985ada91 Merge "Build: Change SANITIZE_LITE install settings" am: 6942dfb65e
am: 9356ad9d5d

Change-Id: I8d158cd5efdf1b60e37eb0f4d7e7e377b43e69c3
2017-08-31 17:31:12 +00:00
Andreas Gampe 9356ad9d5d Merge "Build: Change SANITIZE_LITE install settings"
am: 6942dfb65e

Change-Id: I81c572ca5866e3ca07d26f948bb44d8c9deabe74
2017-08-31 17:28:36 +00:00
Treehugger Robot 6942dfb65e Merge "Build: Change SANITIZE_LITE install settings" 2017-08-31 17:16:26 +00:00
Andreas Gampe 4ed21d10e8 Build: Change SANITIZE_LITE install settings
Under SANITIZE_LITE, the default app_process is not instrumented.
Embedding sanitized libraries into APKs will lead to crashing apps.
So move second-stage APKs to /data/asan.

The tradeoff is that for now we won't run these sanitized binaries.
Adding support for that is future work.

Also do not do a rebuild of the boot image. This would invalidate
the first-stage results. Note that this is technically dangerous,
as stack overflow guard sizes will not be adapted for ASAN runs.
However, this is a general incompatibility.

Also do not rebuild system_other. Apps are not rebuilt, so it will
create an empty image.

(cherry picked from commit 481660ef34)

Bug: 36458146
Test: m && m SANITIZE_TARGET=address SANITIZE_LITE=true
Merged-In: I3898bc53cad264529f126e6bf0af9c6ca1736877
Change-Id: I3898bc53cad264529f126e6bf0af9c6ca1736877
2017-08-31 08:56:18 -07:00
Bowgo Tsai fa395903e5 Merge "Copy adbd from system/bin to recovery/root/sbin" am: 6803a3444a
am: 02a84c762d

Change-Id: Ia9282cadea6e2645362dc6752a0763845ef37202
2017-08-31 06:35:46 +00:00
Bowgo Tsai 02a84c762d Merge "Copy adbd from system/bin to recovery/root/sbin"
am: 6803a3444a

Change-Id: Id28c6965e05ca828cc736621ddcfa14606753644
2017-08-31 06:30:35 +00:00
Treehugger Robot 6803a3444a Merge "Copy adbd from system/bin to recovery/root/sbin" 2017-08-31 06:22:16 +00:00
Ian Pedowitz 762bc42f85 Merge "master is now P" am: b9710fb602 -s ours
am: bc046e882b

Change-Id: Ifc1517a151919b230ed5a61b91d0882b6350c746
2017-08-31 05:19:37 +00:00
Ian Pedowitz bc046e882b Merge "master is now P"
am: b9710fb602  -s ours

Change-Id: Ie5cef516089cbe50e5dda71be46c48076d908c74
2017-08-31 05:12:37 +00:00
Treehugger Robot b9710fb602 Merge "master is now P" 2017-08-31 01:14:38 +00:00
bohu dc745a9090 emulator: fix widevine drm vndbinder denial
[   86.252399] type=1400 audit(1503684692.153:25): avc: denied { read write } for pid=4160 comm="android.hardwar" name="vndbinder" dev="tmpfs" ino=5163 scontext=u:r:hal_drm_widevine:s0 tcontext=u:object_r:vndbinder_device:s0 tclass=chr_file permissive=0

BUG: 64726466

Test: build sdk_gphone_x86-user target, launch it
and the above denial should be fixed.

Change-Id: Ied1268878236c42fbb0751a0f33014b332d78c32
Merged-In: Ied1268878236c42fbb0751a0f33014b332d78c32
2017-08-30 17:13:55 -07:00
bohu 913a990249 emulator: fix selinux issues
with cas/camera/drm hals

BUG: 64726466

Test: build aosp_x86-eng, boot emulator
without camera/drm hals killed by
selinux avc denials; camera can take
pictures

Change-Id: I8a154fdb5d7aa7763aab2b912976eb9e1d329cdb
Merged-In: I8a154fdb5d7aa7763aab2b912976eb9e1d329cdb
2017-08-30 17:13:51 -07:00
bohu 7b5e1abacb emulator: squash misc modifications from oc-emu-dev
Change-Id: I7380292cd4dc851a987683bdf61d511dbf74aff6
Merged-In: I7380292cd4dc851a987683bdf61d511dbf74aff6
2017-08-30 17:13:47 -07:00