Commit Graph

43685 Commits

Author SHA1 Message Date
Tao Bao 2462a1eb82 releasetools: Add AbOtaPropertyFiles.
am: 85f1698fa0

Change-Id: Ia829f4417659946fcc99b22b66bb392a0a75ae49
2018-03-16 05:08:10 +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
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
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
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
Adam Seaton 1be58ef810 Merge "DO NOT MERGE Updating security string for oc-mr1-dev to 2018-05-05" into oc-mr1-dev am: 3bdafad5b0 -s ours
am: bb4986c6ce

Change-Id: I39be7bf84d8ea15f7cf889b68f63a021a9563af5
2018-03-14 22:30:26 +00:00
Adam Seaton bb4986c6ce Merge "DO NOT MERGE Updating security string for oc-mr1-dev to 2018-05-05" into oc-mr1-dev
am: 3bdafad5b0  -s ours

Change-Id: I1cfcb20c43ded9ec84a1343de5ce5bd5992281f6
2018-03-14 22:16:05 +00:00
Adam Lesinski 0d94f49880 Merge "Enable apps to build with resource namespaces" am: d3547d9d5b
am: 9600655fac  -s ours

Change-Id: Ic7285ba9db8f7d875f2123f56ba2e631074746de
2018-03-14 22:08:59 +00:00
Adam Lesinski 9600655fac Merge "Enable apps to build with resource namespaces"
am: d3547d9d5b

Change-Id: I52e7d6c6c805123e0e0815a52854e848ea473ffe
2018-03-14 22:00:41 +00:00
TreeHugger Robot 3bdafad5b0 Merge "DO NOT MERGE Updating security string for oc-mr1-dev to 2018-05-05" into oc-mr1-dev 2018-03-14 21:58:27 +00:00
Colin Cross bc0c494d3a Allow aapt2 rules to take zipped resource files
Allow aapt2 rules to take zipped resource files similar to the
way the javac rules take srcjars.  For now, unzip the files using
extract_srcjars.sh, and then use aapt2 compile --dir.  Eventually
it could be done with aapt2 compile --zip.

Bug: 73885582
Bug: 74574557
Test: m checkbuild
Change-Id: I97ea3ff305e7a9ef2a908b4cf0bca903af62c6b1
2018-03-14 14:13:18 -07:00
Treehugger Robot d3547d9d5b Merge "Enable apps to build with resource namespaces" 2018-03-14 21:05:55 +00:00
Colin Cross 475475ca3a Merge "Allow locally disabling R8" am: 017a894c6e
am: 391a95da7e

Change-Id: I3c0a0d0eef90b3c824cce9c2e350714c0d00761f
2018-03-14 19:28:15 +00:00
Colin Cross 391a95da7e Merge "Allow locally disabling R8"
am: 017a894c6e

Change-Id: I8eb9e5ffaf1ca0a5de56ad92acc27490cf76c984
2018-03-14 19:21:09 +00:00
Colin Cross 017a894c6e Merge "Allow locally disabling R8" 2018-03-14 19:07:58 +00:00
Colin Cross 11e2d55c0f Add LOCAL_SRCJARS support
Allow java modules to take jars containing .java files as an input.
For turbine, pass them directly to turbine.  For javac, extract them
to a directory and pass a list of the files to javac.

Bug: 73885582
Test: m checkbuild
Change-Id: Ib4351a5b4b165a55e5fb02ee2680466db368983a
2018-03-14 12:05:04 -07:00
Colin Cross 93d6550c53 Remove unused .fs file suppport
.fs files are obsolete.

Bug: 73885582
Test: m checkbuild
Change-Id: I74b618099333fe565c7b235994be64e6466d2da6
2018-03-14 12:05:01 -07:00
Colin Cross c3e7074df1 Remove unused file lists
RS_FILES and AIDL_FILES were used for cleaning up the intermediate
src dir, but are no longer used after
If7529979de6fa62a651933a3a974f47b033851d6 and
I01feff7cc399ac5b88b83333a1ac86928d0a81e6.

Bug: 73885582
Test: m checkbuild
Change-Id: If2653f846b568fd2587c8e055ef820e17760f133
2018-03-14 12:04:58 -07:00
Colin Cross 5ef6e79c21 Remove sharding support from make
Sharding is not used in make any more, the large java modules
(libcore and framework) have moved to Soong.  Keeping sharding
support complicates java compiling, so remove it.

Bug: 73885582
Test: m checkbuild
Change-Id: I2932f9e96bfc8f2ebf82095b16d6c0b3c51613f0
2018-03-14 12:04:55 -07:00
Colin Cross b6013af085 Move aapt flags from java_common.mk to aapt_flags.mk
The aapt flags were being set in java_common.mk, which is used by
various entry points.  host_dalvik_java_library.mk and
host_java_library.mk, and java_library.mk don't support aapt, only
package_internal.mk and static_java_library.mk do.  Move the aapt
flags into aapt_flags.mk, and include it from package_internal.mk
and static_java_library.mk.

Bug: 73885582
Test: no change to build-${TARGET_PRODUCT}.ninja
Change-Id: I124393846d37b9bbc941272cce4274121ac235ef
2018-03-14 12:04:35 -07:00
Adam Lesinski 960de8efcd Enable apps to build with resource namespaces
Setting LOCAL_AAPT_NAMESPACES := true enables
namespaces for an app and requires any library resources
to be fully qualified by their package.

Test: manual
Bug: 73885582
Change-Id: Ia6bfc82ee8b8d6335f8e7c2abe94ce36467a012d
Merged-In: Ia6bfc82ee8b8d6335f8e7c2abe94ce36467a012d
2018-03-14 12:04:01 -07:00
Colin Cross 5c66c2864a Allow locally disabling R8
Bug: 74746744
Test: m checkbuild
Change-Id: I5741f15821cf8de5df494ed8ad31d32a44657514
2018-03-14 17:00:23 +00:00
Julien Desprez 4e6987f9e6 Merge "Update the base autogenerated config template for instru" am: edf8fc4e51
am: f602e26e1d

Change-Id: If47ea726220844b32d4d56878f5a88d336745b52
2018-03-14 14:26:11 +00:00
Julien Desprez f602e26e1d Merge "Update the base autogenerated config template for instru"
am: edf8fc4e51

Change-Id: I8307be4b0acebdc910762073b756fa4e442bb415
2018-03-14 14:19:35 +00:00
Julien Desprez edf8fc4e51 Merge "Update the base autogenerated config template for instru" 2018-03-14 14:03:42 +00:00
Martijn Coenen 16ab41d8ff Merge "Products launching with API 28 need 64-bit binder interface." into pi-dev
am: d027dfa39f

Change-Id: I259f69f1be9baeab32f45637a17f43dea3c1b728
2018-03-14 11:17:17 +00:00
Martijn Coenen d027dfa39f Merge "Products launching with API 28 need 64-bit binder interface." into pi-dev 2018-03-14 11:05:19 +00:00
Simran Basi 1ef901c167 build/make: Add default suite for all native tests/benchmarks
Not all native tests have the "tests" tag so adjust the logic to be:
NATIVE_TESTS||NATIVE_BENCHMARKS||(APPS&&tags==tests)

Bug: 74339384
Test: Rebuilt module-info.json, verified native tests now have
      their suite set to null-suite and have auto_test_config=True
      Double checked a frameworks App unittest as well.

Change-Id: Idea00adcebfc1a78b0c6d8ade40feddb1e90ed83
Merged-In: Idea00adcebfc1a78b0c6d8ade40feddb1e90ed83
2018-03-13 18:31:48 -07:00
Adam Seaton ffccb8967d [automerger] [DO NOT MERGE] Updating security string for nyc-dev to 2018-05-01 bug: 74345861 am: 7c0f23dce5 am: 21f45f7edc am: 5a2c0096d5 am: bc62637ffa skipped: 262656a47f am: c3dd369446 am: 98086a211c am: 47e4c77438 -s ours
am: c30cc7d343

Change-Id: I7ee6c79fe27bed9fe93b071e19c57380ebe229a9
2018-03-14 00:46:35 +00:00
Adam Seaton c30cc7d343 [automerger] [DO NOT MERGE] Updating security string for nyc-dev to 2018-05-01 bug: 74345861 am: 7c0f23dce5 am: 21f45f7edc am: 5a2c0096d5 am: bc62637ffa skipped: 262656a47f am: c3dd369446 am: 98086a211c
am: 47e4c77438  -s ours

Change-Id: I5b2bb6033ef974d93e5d092c5b50abc0babbfcf1
2018-03-14 00:38:23 +00:00
Adam Seaton 47e4c77438 [automerger] [DO NOT MERGE] Updating security string for nyc-dev to 2018-05-01 bug: 74345861 am: 7c0f23dce5 am: 21f45f7edc am: 5a2c0096d5 am: bc62637ffa skipped: 262656a47f am: c3dd369446
am: 98086a211c

Change-Id: Icbb289c0edd5f754f1ae4b180376163e4c3f6879
2018-03-14 00:33:23 +00:00
Adam Seaton 98086a211c [automerger] [DO NOT MERGE] Updating security string for nyc-dev to 2018-05-01 bug: 74345861 am: 7c0f23dce5 am: 21f45f7edc am: 5a2c0096d5 am: bc62637ffa skipped: 262656a47f
am: c3dd369446

Change-Id: If6822cab153c266841fc35fcfa2bb38a4ef4ab95
2018-03-14 00:26:02 +00:00
jdesprez b8f85204a6 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 automatically.

Test: none
Bug: 74440293
Change-Id: Ia82e8287f212f4daec97523394517bfbbe7a86d3
2018-03-13 13:43:42 -07:00