fa8a5d914e
configstore: remove configstore 1.1
...
am: 43e711962e
2017-09-07 01:14:39 +00:00
cb72cda511
Merge "[DO NOT MERGE] Update platform security string to 2017-10-01 in mnc-dev Bug:64896113" into mnc-dev am: 84557be29b am: bf38f45749 am: 40720f6a25 am: fbd8bcf329 -s ours am: 137d5f095a am: e522ce436f am: 6613b4e6fc am: abf1d733f3 am: 77d8b88c61 -s ours am: 181a73eeb6 am: f84b592ed3
...
am: 9afe3d5af4
2017-09-06 23:51:54 +00:00
9afe3d5af4
Merge "[DO NOT MERGE] Update platform security string to 2017-10-01 in mnc-dev Bug:64896113" into mnc-dev am: 84557be29b am: bf38f45749 am: 40720f6a25 am: fbd8bcf329 -s ours am: 137d5f095a am: e522ce436f am: 6613b4e6fc am: abf1d733f3 am: 77d8b88c61 -s ours am: 181a73eeb6
...
am: f84b592ed3
2017-09-06 23:43:30 +00:00
f84b592ed3
Merge "[DO NOT MERGE] Update platform security string to 2017-10-01 in mnc-dev Bug:64896113" into mnc-dev am: 84557be29b am: bf38f45749 am: 40720f6a25 am: fbd8bcf329 -s ours am: 137d5f095a am: e522ce436f am: 6613b4e6fc am: abf1d733f3 am: 77d8b88c61 -s ours
...
am: 181a73eeb6
2017-09-06 23:39:24 +00:00
181a73eeb6
Merge "[DO NOT MERGE] Update platform security string to 2017-10-01 in mnc-dev Bug:64896113" into mnc-dev am: 84557be29b am: bf38f45749 am: 40720f6a25 am: fbd8bcf329 -s ours am: 137d5f095a am: e522ce436f am: 6613b4e6fc am: abf1d733f3
...
am: 77d8b88c61
2017-09-06 23:35:23 +00:00
77d8b88c61
Merge "[DO NOT MERGE] Update platform security string to 2017-10-01 in mnc-dev Bug:64896113" into mnc-dev am: 84557be29b am: bf38f45749 am: 40720f6a25 am: fbd8bcf329 -s ours am: 137d5f095a am: e522ce436f am: 6613b4e6fc
...
am: abf1d733f3
2017-09-06 23:31:23 +00:00
abf1d733f3
Merge "[DO NOT MERGE] Update platform security string to 2017-10-01 in mnc-dev Bug:64896113" into mnc-dev am: 84557be29b am: bf38f45749 am: 40720f6a25 am: fbd8bcf329 -s ours am: 137d5f095a am: e522ce436f
...
am: 6613b4e6fc
2017-09-06 23:27:25 +00:00
6613b4e6fc
Merge "[DO NOT MERGE] Update platform security string to 2017-10-01 in mnc-dev Bug:64896113" into mnc-dev am: 84557be29b am: bf38f45749 am: 40720f6a25 am: fbd8bcf329 -s ours am: 137d5f095a
...
am: e522ce436f
2017-09-06 23:22:54 +00:00
e522ce436f
Merge "[DO NOT MERGE] Update platform security string to 2017-10-01 in mnc-dev Bug:64896113" into mnc-dev am: 84557be29b am: bf38f45749 am: 40720f6a25 am: fbd8bcf329 -s ours
...
am: 137d5f095a
2017-09-06 23:18:54 +00:00
137d5f095a
Merge "[DO NOT MERGE] Update platform security string to 2017-10-01 in mnc-dev Bug:64896113" into mnc-dev am: 84557be29b am: bf38f45749 am: 40720f6a25
...
am: fbd8bcf329
2017-09-06 23:14:52 +00:00
fbd8bcf329
Merge "[DO NOT MERGE] Update platform security string to 2017-10-01 in mnc-dev Bug:64896113" into mnc-dev am: 84557be29b am: bf38f45749
...
am: 40720f6a25
2017-09-06 23:10:23 +00:00
40720f6a25
Merge "[DO NOT MERGE] Update platform security string to 2017-10-01 in mnc-dev Bug:64896113" into mnc-dev am: 84557be29b
...
am: bf38f45749
2017-09-06 23:05:23 +00:00
bf38f45749
Merge "[DO NOT MERGE] Update platform security string to 2017-10-01 in mnc-dev Bug:64896113" into mnc-dev
...
am: 84557be29b
2017-09-06 23:00:22 +00:00
84557be29b
Merge "[DO NOT MERGE] Update platform security string to 2017-10-01 in mnc-dev Bug:64896113" into mnc-dev
2017-09-06 22:44:40 +00:00
28bec43b96
Merge "releasetools: Validate A/B OTA payload signatures." am: 631b3a031c am: d5ec31f8a9
...
am: 9e8416917a
2017-09-06 21:15:46 +00:00
9e8416917a
Merge "releasetools: Validate A/B OTA payload signatures." am: 631b3a031c
...
am: d5ec31f8a9
2017-09-06 21:07:46 +00:00
d5ec31f8a9
Merge "releasetools: Validate A/B OTA payload signatures."
...
am: 631b3a031c
2017-09-06 20:48:14 +00:00
631b3a031c
Merge "releasetools: Validate A/B OTA payload signatures."
2017-09-06 20:35:07 +00:00
dcfe8aa775
Merge "Include vbmeta.img into <product>-img.zip" into oc-mr1-dev
...
am: c5027d6e7d
2017-09-06 16:58:37 +00:00
c5027d6e7d
Merge "Include vbmeta.img into <product>-img.zip" into oc-mr1-dev
2017-09-06 16:47:32 +00:00
6bbb11a620
Include vbmeta.img into <product>-img.zip
...
Bug: 65227202
Test: make dist, checks vbmeta.img is included in <product>-img.zip
Change-Id: I3e09f036441bcf7e98d8f76360df1e17466ae38e
2017-09-06 09:30:32 +08:00
cb373600f2
Merge "Update compatibility matrix logic." into oc-mr1-dev
...
am: d7314b90bd
2017-09-05 21:14:30 +00:00
d7314b90bd
Merge "Update compatibility matrix logic." into oc-mr1-dev
2017-09-05 20:54:27 +00:00
929b08ccbe
Merge "Fix boot image profile in make files" am: 71f622e247 am: c48a5c0a31
...
am: 26bd213b8c
2017-09-05 17:43:40 +00:00
26bd213b8c
Merge "Fix boot image profile in make files" am: 71f622e247
...
am: c48a5c0a31
2017-09-05 17:34:30 +00:00
c48a5c0a31
Merge "Fix boot image profile in make files"
...
am: 71f622e247
2017-09-05 17:26:32 +00:00
71f622e247
Merge "Fix boot image profile in make files"
2017-09-05 17:14:08 +00:00
4aad28e830
Merge "Disable adb authorization in GSI" into oc-mr1-dev
...
am: a93c32e338
2017-09-04 09:54:43 +00:00
a93c32e338
Merge "Disable adb authorization in GSI" into oc-mr1-dev
2017-09-04 09:41:10 +00:00
a2cc65b099
Fix boot image profile in make files
...
Update location to framework/base/config instead of frameworks/base
Fixed dex2oat dependency to my_out_boot_image_profile_location
instead of my_out_profile_location.
Bug: 37966211
Test: make and flash
Merged-In: I446f11216cf6342861bbbf56ac5c4da2f36fb755
(cherry picked from commit 75edf540e2
2017-09-02 23:47:32 +00:00
1048094109
Merge "Fix the build breakage on git-wear-master/mirror-aosp-master-with-vendor" am: 2fc0f4e484 am: dc8ddb2da5
...
am: 6248e3fbaf
2017-09-02 19:51:11 +00:00
6248e3fbaf
Merge "Fix the build breakage on git-wear-master/mirror-aosp-master-with-vendor" am: 2fc0f4e484
...
am: dc8ddb2da5
2017-09-02 19:43:39 +00:00
dc8ddb2da5
Merge "Fix the build breakage on git-wear-master/mirror-aosp-master-with-vendor"
...
am: 2fc0f4e484
2017-09-02 19:36:10 +00:00
2fc0f4e484
Merge "Fix the build breakage on git-wear-master/mirror-aosp-master-with-vendor"
2017-09-02 19:26:48 +00:00
9e37028db0
Fix the build breakage on git-wear-master/mirror-aosp-master-with-vendor
...
git-wear-master/mirror-aosp-master-with-vendor were still broken due to
my Make synatx mistakes.
Bug: b/64308460
Test: download <git-wear-master> branch locally, and then do:
m -j out/target/product/anglefish/package-stats.txt
Change-Id: Ic1a03b452db7583811a3a3b74067f1fc54f873b4
2017-09-02 10:25:17 -07:00
8e1c7e1455
Merge "Fix the build breakage on git-wear-master/mirror-aosp-master-with-vendor" am: 99e44773ba am: e665010297
...
am: 4a03375cc7
2017-09-02 05:23:24 +00:00
4a03375cc7
Merge "Fix the build breakage on git-wear-master/mirror-aosp-master-with-vendor" am: 99e44773ba
...
am: e665010297
2017-09-02 05:15:53 +00:00
e665010297
Merge "Fix the build breakage on git-wear-master/mirror-aosp-master-with-vendor"
...
am: 99e44773ba
2017-09-02 05:09:23 +00:00
99e44773ba
Merge "Fix the build breakage on git-wear-master/mirror-aosp-master-with-vendor"
2017-09-02 04:57:12 +00:00
d05e19df41
Fix the build breakage on git-wear-master/mirror-aosp-master-with-vendor
...
The problem is that when I added .KATI_RESTAT for javalib.jar, I didn't
change the function: create-empty-package to generate javalib.jar.tmp.
The problem causes the build breakage on MacOS/Jack.
Bug: b/64308460
Test: download <git-wear-master> branch locally, and then do:
m -j out/target/product/angelfish/package-stats.txt
Change-Id: I9a5d74caaf164b44676e456050b4f8a5b3bdded0
2017-09-01 18:52:41 -07:00
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
5b0ebe7304
Merge "Pack system/update_engine/scripts into otatools.zip." am: 27bfc86d8b am: cdfabdbf85
...
am: 5b8e0ffaf9
2017-09-01 17:06:07 +00:00
5b8e0ffaf9
Merge "Pack system/update_engine/scripts into otatools.zip." am: 27bfc86d8b
...
am: cdfabdbf85
2017-09-01 17:00:12 +00:00
cdfabdbf85
Merge "Pack system/update_engine/scripts into otatools.zip."
...
am: 27bfc86d8b
2017-09-01 16:54:07 +00:00
27bfc86d8b
Merge "Pack system/update_engine/scripts into otatools.zip."
2017-09-01 16:45:08 +00:00
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
95ddc40d53
Disable adb authorization in GSI
...
To support test automation, disable adb authorization in GSI.
Applied the patch, and device won't ask for adb authorization after
overriding system image with GSI.
Bug: 64489353
Test: boot up with GSI, and check by 'adb devices'
Change-Id: Ibaa3aaa90a89ae03b8b23abf37f53ede64d15789
2017-09-01 12:00:09 +08:00
2df6c08abc
Merge "Fix boot image profile in make files" into oc-mr1-dev
...
am: b9cd7e6ade
2017-09-01 02:52:45 +00:00
b9cd7e6ade
Merge "Fix boot image profile in make files" into oc-mr1-dev
2017-09-01 02:47:09 +00:00
88482fe651
Merge "sdk: add vendor-qem.img into the deps list" am: cfde9a84bc am: 1d59beefeb
...
am: d6a91a6a10
2017-09-01 00:38:48 +00:00
Sundong Ahn