Commit Graph

43915 Commits

Author SHA1 Message Date
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
Nan Zhang
af5788248a Fix the incorrect turbine flag.
Bug: 74831968
Test: m -j java TURBINE_ENABLED=false
Change-Id: Id6ca380c97bbcd3731c815e37513b7e949cccdfb
(cherry picked from commit 78c19aa9ef)
Merged-In: Id6ca380c97bbcd3731c815e37513b7e949cccdfb
2018-03-19 19:58:02 +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
jdesprez
d69d64607a Update the base autogenerated config template for instru
For APCT auto-generated configuration, the template will
include the test-suite-tag that will allow it to be
picked up by the current ATP gcl config.

Test: none
Bug: 74440293
Change-Id: I66e9f2f75e43a9371cf8b55130cd49a962753167
Merged-In: Ia82e8287f212f4daec97523394517bfbbe7a86d3
2018-03-16 18:16:34 +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
Martijn Coenen
c3162eeff0 Products launching with API 28 need 64-bit binder interface.
This time around we're really deprecating the 32-bit
binder interface (v7), even for 32-bit devices.

Upgrading devices can keep using it.

Bug: 69775513
Test: manual makefile prodding
Change-Id: I3850418ca267e72593f5f12b940e5382b29b024a
Merged-In: I3850418ca267e72593f5f12b940e5382b29b024a
2018-03-16 09:43:39 +01: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
Colin Cross
0c0adb993c Allow compiles with only srcjars
Some javac and turbine compiles have no source files but sources
from srcjars.  Continue with compilation if the java source list
is empty but the srcjar source list is not.

Bug: 73885582
Test: m checkbuild
Change-Id: Ica412de2dd1b1bfc12c01c3eafca884220d42771
2018-03-15 13:07:33 -07:00
Adrian Roos
12f3d9e2be Multi cutout: replace narrow with corner overlay
Bug: 74982138
Test: make droid
Change-Id: Ia6b25a0cf3718d316f944b7abf44fe9711fa0cf5
2018-03-15 19:23:05 +00:00
Greg Hartman
2bfe38144f Increase size of data to accomodate ASAN and CTS
BUG: 74946342
Test: Local build works
Change-Id: I17e9973549ba96edb7cfbd574f68a2bc0bf55f98
2018-03-15 11:06:02 -07:00
Colin Cross
6b27285619 Update turbine command line flags
The latest version of turbine requires a -- after the javac
options, and uses multiple --bootclasspath arguments instead
of a javac-style colon separated list.

Test: m javac-check
Bug: 74339924
Change-Id: I3f694ac375eab61954d4fe63c1166a18314bf75f
2018-03-15 06:04:53 +00:00
Colin Cross
a9aa74ca38 Merge changes I97ea3ff3,Ib4351a5b,I74b61809,If2653f84,I2932f9e9, ... am: 34af6a41ff
am: 3d8c0a2c9e

Change-Id: I310c37dd5ef95e94f64630194c9aed1effa4818e
2018-03-14 23:48:21 +00:00
Colin Cross
3d8c0a2c9e Merge changes I97ea3ff3,Ib4351a5b,I74b61809,If2653f84,I2932f9e9, ...
am: 34af6a41ff

Change-Id: I90487b3fed921af1571d1e87491a92e08fdd8050
2018-03-14 23:42:45 +00:00
Colin Cross
34af6a41ff Merge changes I97ea3ff3,Ib4351a5b,I74b61809,If2653f84,I2932f9e9, ...
* changes:
  Allow aapt2 rules to take zipped resource files
  Add LOCAL_SRCJARS support
  Remove unused .fs file suppport
  Remove unused file lists
  Remove sharding support from make
  Move aapt flags from java_common.mk to aapt_flags.mk
2018-03-14 23:29:49 +00:00