Commit Graph

43720 Commits

Author SHA1 Message Date
Tao Bao 1f95c2bb41 Merge "Use bsdiff to generate recovery-from-boot.p for system-root-image." am: ad29fe419e
am: 40feb95108

Change-Id: I54bf5debc6ffcf8d069211385b55844dcaaca605
2018-03-20 00:27:50 +00:00
Tao Bao 40feb95108 Merge "Use bsdiff to generate recovery-from-boot.p for system-root-image."
am: ad29fe419e

Change-Id: I064cf6ae89b547dd18061f438362c0d1152b88a7
2018-03-20 00:19:13 +00:00
Treehugger Robot ad29fe419e Merge "Use bsdiff to generate recovery-from-boot.p for system-root-image." 2018-03-20 00:00:34 +00:00
Tao Bao 6d5d623987 Use bsdiff to generate recovery-from-boot.p for system-root-image.
This CL handles a path that uses system-root-image on non-A/B device.
For this path, we can't generate recovery-from-boot patch with imgdiff,
because boot/recovery images contain different number of entries (only
recovery iamge has ramdisk image now).

Using BOARD_USES_FULL_RECOVERY_IMAGE can work around the issue, at the
cost of extra size. Compared to carrying full recovery image, this CL
saves the cost of the kernel size, by putting a patch that's roughly the
size of the recovery ramdisk.

The applypatch executable already detects and handles a bsdiff patch
automatically. No change required to that end.

Note that it won't further reduce the patch size by handling that
ramdisk entry specially, because (a) that's the only difference between
the two images; and (b) there's no corresponding data in boot image to
be diff'd against.

Bug: 72731506
Test: `m dist` with aosp_angler-userdebug. Check the device can install
      recovery image successfully (after intentionally corrupting the
      recovery image).
Test: Build aosp_angler-userdebug with BOARD_BUILD_SYSTEM_ROOT_IMAGE set.
      Verify the generated patch files.
Test: Run validate_target_files.py with the target_files.zips.
Change-Id: I69c06f51ba8c39ae059c5e9a6872a9f10600cf17
2018-03-19 14:13:02 -07:00
Colin Cross df81a0f7a2 Merge "Provide testcases directory for host cross out (windows) modules" am: 238bb91678
am: 70e4074aa8

Change-Id: I46160345f7a9b693a87c773ba7c7969c8e1a1a28
2018-03-19 21:02:56 +00:00
Colin Cross 61acd8295c Merge "Replace extract_srcjars.sh with zipsync" am: c9907cc8f6
am: f434e35a47

Change-Id: I8304134f6b48ba57572b41cf6c4fc7cecd4d0dcc
2018-03-19 21:01:49 +00:00
Colin Cross 70e4074aa8 Merge "Provide testcases directory for host cross out (windows) modules"
am: 238bb91678

Change-Id: Ia79d4709be1426636527da40fa7a0f39d3f521d9
2018-03-19 20:55:51 +00:00
Colin Cross f434e35a47 Merge "Replace extract_srcjars.sh with zipsync"
am: c9907cc8f6

Change-Id: Ib99ea1ef3a51cf34a3494453f5ebefe7f2059203
2018-03-19 20:54:49 +00:00
Colin Cross 238bb91678 Merge "Provide testcases directory for host cross out (windows) modules" 2018-03-19 20:40:50 +00:00
Colin Cross c9907cc8f6 Merge "Replace extract_srcjars.sh with zipsync" 2018-03-19 20:33:08 +00:00
Tao Bao ad5440d20e Merge "releasetools: Add NonAbOtaPropertyFiles for non-A/B OTA packages." am: 93a84dd9a6
am: f13591bbb3

Change-Id: I43114d7b8ce5900e706e9f234c0fe67cff7cf268
2018-03-19 20:05:28 +00:00
Tao Bao f13591bbb3 Merge "releasetools: Add NonAbOtaPropertyFiles for non-A/B OTA packages."
am: 93a84dd9a6

Change-Id: I0636d2d29410f980681e463aff9eacc4e4f71678
2018-03-19 19:59:50 +00:00
Tao Bao 93a84dd9a6 Merge "releasetools: Add NonAbOtaPropertyFiles for non-A/B OTA packages." 2018-03-19 19:42:24 +00:00
Søren Gjesse 31f40492d4 Merge "Enable R8 by default (second attempt for Q)" am: d04f28db7b
am: 85ac8c6e39

Change-Id: Idd417f98756496811230fb7ee97f9193e76db00d
2018-03-19 08:01:10 +00:00
Søren Gjesse 85ac8c6e39 Merge "Enable R8 by default (second attempt for Q)"
am: d04f28db7b

Change-Id: Ib700a57f75ad3e7ce780faa0fcf74684aee59816
2018-03-19 07:51:47 +00:00
Søren Gjesse d04f28db7b Merge "Enable R8 by default (second attempt for Q)" 2018-03-19 07:27:20 +00:00
Tao Bao c0746f4e94 releasetools: Add NonAbOtaPropertyFiles for non-A/B OTA packages.
This CL exposes ota-property-files flag for non-A/B OTA packages.
Currently the line only contains the info for the METADATA entry, for
example "ota-property-files=metadata:69:286". This allows system updater
to just download the METADATA entry, as opposed to downloading the
entire package, to learn about the info regarding the OTA package (e.g.
post-OTA build fingerprint). Note that this requires the OTA server-side
support to pass down the flag along with the update URL.

Bug: 74210298
Test: python -m unittest test_ota_from_target_files
Test: Generate a non-A/B package and check the property-files string.
Change-Id: I1482c587e18ea7101c8328777ea988c2d8ca06ac
2018-03-18 11:59:38 -07:00
Colin Cross e887ccbf12 Provide testcases directory for host cross out (windows) modules
If HOST_CROSS_OUT_TESTCASES is not defined, then a module that
builds for windows and has a test config will attempt to install
the config file to /<module>/<module>.config.

Fixes:
[ 54% 99/183] Copy: /simpleperf_unit_test/x86/simpleperf_unit_test.exeninja: error: mkdir(/simpleperf_unit_test): Permission denied

Test: m simpleperf_unit_test
Change-Id: I07dcecbce9c710b29fec5fbdedc462be3245b578
2018-03-17 05:14:13 +00:00
Steven Moreland 062fe37593 Merge "generic: BOARD_VNDK_VERSION := current" am: 252ff3d6b6
am: d7adba6ae5

Change-Id: Ib9589451b5386ae73884ec77a2a8b8d6c7cc7d6b
2018-03-16 21:52:46 +00:00
Steven Moreland 7795922410 Merge "generic_arm64: BOARD_VNDK_VERSION := current" am: d466d2389d
am: f44560e86c

Change-Id: I3024ec6ae3279845bc3ab61953e549060c110c85
2018-03-16 21:51:55 +00:00
Steven Moreland d7adba6ae5 Merge "generic: BOARD_VNDK_VERSION := current"
am: 252ff3d6b6

Change-Id: I82dd37cbc8e2606872daa84c5c942e93700fe336
2018-03-16 21:40:24 +00:00
Steven Moreland f44560e86c Merge "generic_arm64: BOARD_VNDK_VERSION := current"
am: d466d2389d

Change-Id: I6e1d0725387c650c89858d3f3301d129ef209eb2
2018-03-16 21:37:44 +00:00
Treehugger Robot 252ff3d6b6 Merge "generic: BOARD_VNDK_VERSION := current" 2018-03-16 21:28:15 +00:00
Treehugger Robot d466d2389d Merge "generic_arm64: BOARD_VNDK_VERSION := current" 2018-03-16 21:24:39 +00:00
Adrian Roos 4e6f96cd3c Merge "Multi cutout: replace narrow with corner overlay" into pi-dev
am: dc3806d97e

Change-Id: I386512f6fc77bc2582dc9691f25a0bdbda401663
2018-03-16 14:37:01 +00:00
Adrian Roos dc3806d97e Merge "Multi cutout: replace narrow with corner overlay" into pi-dev 2018-03-16 14:27:30 +00:00
Tao Bao c34ddfb208 Merge "releasetools: Add AbOtaPropertyFiles." am: e128734fa0
am: 8e9516713f

Change-Id: If542cb0ec08ed155928afb767f38609bc89aa68e
2018-03-16 05:16:24 +00:00
Tao Bao 2462a1eb82 releasetools: Add AbOtaPropertyFiles.
am: 85f1698fa0

Change-Id: Ia829f4417659946fcc99b22b66bb392a0a75ae49
2018-03-16 05:08:10 +00:00
Tao Bao 8e9516713f Merge "releasetools: Add AbOtaPropertyFiles."
am: e128734fa0

Change-Id: I63e223a1b6d3b3c6973a01f667cc7ce4d88e5e31
2018-03-16 05:07:43 +00:00
Tao Bao e128734fa0 Merge "releasetools: Add AbOtaPropertyFiles." 2018-03-16 04:47:46 +00:00
Tao Bao 9d1fe6fefe Merge "releasetools: Create PropertyFiles class." into pi-dev
am: bc12a618b3

Change-Id: Ie8b99a26ef606f845aa80ece49eac41a9dabb61a
2018-03-16 01:58:54 +00:00
Simran Basi 94ca712403 Merge "build/make: Add default suite for all native tests/benchmarks" into pi-dev
am: b429175200  -s ours

Change-Id: I7c21ea9866a615612a2f538ddc3db1682318947b
2018-03-16 01:29:58 +00:00
Steven Moreland 5ee470be27 generic: BOARD_VNDK_VERSION := current
Bug: 70694532
Bug: 69526027
Test: lunch generic-userdebug, m -j, emulator (hangs >2 hours)

Change-Id: I377ab1ba2a5aea75096b27a1ec2366abf9d71fc4
2018-03-15 16:41:33 -07:00
Colin Cross 3f99cd5933 Replace extract_srcjars.sh with zipsync
Use zipsync instead of extract_srcjars.sh.

Also fixes an issue where unzipping a resource zip would
ignore anything that wasn't a *.java file.

Bug: 73885582
Test: m checkbuild
Change-Id: I1c25f65afa196614879071c8655866febebac185
2018-03-15 16:40:05 -07:00
Tao Bao 85f1698fa0 releasetools: Add AbOtaPropertyFiles.
AbOtaPropertyFiles writes 'ota-property-files' into package metadata.
Comparing to StreamingPropertyFiles, AbOtaPropertyFiles additionally
writes a token of 'payload-metadata.bin' for a virtual entry that's head
of the 'payload.bin'. This entry can be used by the system updater to
verify if a payload is applicable to the underlying device.

AbOtaPropertyFiles intends to replace StreamingPropertyFiles, as it
covers all the info of the latter. We keep them both in P, and will
remove the latter in later release.

Bug: 74210298
Test: python -m unittest test_ota_from_target_files
Test: Generate full and incremental A/B OTAs. Check the property-files
      in the METADATA entry.
Change-Id: If5872c8ee0a97a8a95b07d4c69b463aa3fe1b9b9
(cherry picked from commit b63046750c)
2018-03-15 16:23:52 -07:00
Tao Bao bc12a618b3 Merge "releasetools: Create PropertyFiles class." into pi-dev 2018-03-15 23:22:44 +00:00
Colin Cross 2430838b29 Merge "Update turbine command line flags" am: 1f4f67201d
am: 6951409ddb

Change-Id: I1e2c12cfec3408d214b61a5b2061df31c0243f62
2018-03-15 23:09:06 +00:00
Tao Bao f8b2b15a9c Merge "releasetools: Create PropertyFiles class." am: febe7b0736
am: 624f900c01

Change-Id: I58fed3c6e450e3bed7af603d4ad0664618d4d319
2018-03-15 23:05:54 +00:00
Colin Cross 59881512af Merge "Allow compiles with only srcjars" am: f2a8007912
am: 57aa4b8f80

Change-Id: Icb321b88000c8e998f019ccbec7d1cc97d36eb78
2018-03-15 23:01:50 +00:00
Colin Cross 6951409ddb Merge "Update turbine command line flags"
am: 1f4f67201d

Change-Id: I6cf149dbd5986f030f85c1e339968ad345223217
2018-03-15 22:53:52 +00:00
Tao Bao 624f900c01 Merge "releasetools: Create PropertyFiles class."
am: febe7b0736

Change-Id: I2c8ead845861ec8549a76c54be74a7af12fe5dca
2018-03-15 22:50:43 +00:00
Colin Cross 57aa4b8f80 Merge "Allow compiles with only srcjars"
am: f2a8007912

Change-Id: I6d5310c66cfe417007cf82a7571edbb98e358b74
2018-03-15 22:46:46 +00:00
TreeHugger Robot b429175200 Merge "build/make: Add default suite for all native tests/benchmarks" into pi-dev 2018-03-15 22:39:31 +00:00
Colin Cross 1f4f67201d Merge "Update turbine command line flags" 2018-03-15 22:39:28 +00:00
Tao Bao febe7b0736 Merge "releasetools: Create PropertyFiles class." 2018-03-15 22:36:35 +00:00
Treehugger Robot f2a8007912 Merge "Allow compiles with only srcjars" 2018-03-15 22:31:37 +00:00
Steven Moreland adb7d43b5e generic_arm64: BOARD_VNDK_VERSION := current
Bug: 70694532
Bug: 69526027
Test: lunch sdk_gphone_arm64-userdebug, build, boot complete
    (unrelated /system/bin/sdcard crash)
Change-Id: I90a05f43caa479288b812075d06f57dae0a2fb2c
2018-03-15 15:19:06 -07:00
Tao Bao b63046750c releasetools: Add AbOtaPropertyFiles.
AbOtaPropertyFiles writes 'ota-property-files' into package metadata.
Comparing to StreamingPropertyFiles, AbOtaPropertyFiles additionally
writes a token of 'payload-metadata.bin' for a virtual entry that's head
of the 'payload.bin'. This entry can be used by the system updater to
verify if a payload is applicable to the underlying device.

AbOtaPropertyFiles intends to replace StreamingPropertyFiles, as it
covers all the info of the latter. We keep them both in P, and will
remove the latter in later release.

Bug: 74210298
Test: python -m unittest test_ota_from_target_files
Test: Generate full and incremental A/B OTAs. Check the property-files
      in the METADATA entry.
Change-Id: If5872c8ee0a97a8a95b07d4c69b463aa3fe1b9b9
2018-03-15 14:58:31 -07:00
Tao Bao 69203525e4 releasetools: Create PropertyFiles class.
And move StreamingPropertyFiles as its subclass. We will need similar
PropertyFiles instance for non-A/B OTA as well (to expose the
offset/size for the METADATA entry).

Bug: 74210298
Test: python -m unittest test_ota_from_target_files
Test: Generate an A/B OTA. Check the generated property-files string.
Test: pylint --rcfile=pylintrc \
          ota_from_target_files.py \
          test_ota_from_target_files.py
Change-Id: If90d97f0b330749fd8a6cde2ed9d0d6cd6ea60a8
2018-03-15 14:50:55 -07:00
Tao Bao d3fc38a073 releasetools: Create PropertyFiles class.
And move StreamingPropertyFiles as its subclass. We will need similar
PropertyFiles instance for non-A/B OTA as well (to expose the
offset/size for the METADATA entry).

Bug: 74210298
Test: python -m unittest test_ota_from_target_files
Test: Generate an A/B OTA. Check the generated property-files string.
Test: pylint --rcfile=pylintrc \
          ota_from_target_files.py \
          test_ota_from_target_files.py
Change-Id: If90d97f0b330749fd8a6cde2ed9d0d6cd6ea60a8
(cherry picked from commit 432f374a1701909ca324f8b047666614684568c0)
2018-03-15 14:17:44 -07:00