Commit Graph

41668 Commits

Author SHA1 Message Date
Tao Bao
23f7ea9e70 Merge "releasetools: Add common.ZipDelete()." 2017-12-15 16:36:55 +00:00
Søren Gjesse
adcd4c761d Merge "Revert "Enable R8 by default (second attempt)"" 2017-12-15 15:27:16 +00:00
Søren Gjesse
cd13676221 Revert "Enable R8 by default (second attempt)"
This reverts commit f2a697725c.

Reason for revert: b/70710434

Change-Id: Ia6d42e4c2fc7e7a4ca67d42d7aaa57ab95c2cc9a
2017-12-15 15:18:57 +00:00
Søren Gjesse
837408b4ca Merge "Enable R8 by default (second attempt)" 2017-12-15 11:05:25 +00:00
Treehugger Robot
587ced4a80 Merge "Default NDK modules to libc++_shared." 2017-12-15 02:29:58 +00:00
Yifan Hong
43ec6ead28 Rename VINTF XML module names
* system_compatibility_matrix/manifest.xml
   => framework_...
* compatibility_matrix/manifest.xml
   => device_...

This is to follow the naming scheme in VINTF
doc.

Test: build all four targets

Change-Id: If5f6a99ded9964f3500c8e5fb97278f8fd0de387
2017-12-14 18:19:44 -08:00
Tao Bao
89d7ab23e8 releasetools: Add common.ZipDelete().
We have been shelling out to 'zip -d' to delete existing ZIP entries in
add_img_to_target_files.py. This CL moves the function into common.py,
and calls that for the similar work in ota_from_target_files.py. This CL
also adds unittests for the newly added function.

Test: `m dist`
Test: python -m unittest test_common
Test: ota_from_target_files.py generates identical packages w/ and w/o
      the CL (so we know the streaming property computation is intact).
Test: Run 'add_img_to_target_files.py -a' that triggers a call to
      ReplaceUpdatedFiles().
Change-Id: Icaa6c3ea3ee2166023f78fa79275295f837ea842
2017-12-14 17:17:04 -08:00
Yifan Hong
ed42caf94d Move fwk comp mat level logic into assemble_vintf
Deprecation schedule requirements is specified in assemble_vintf.
Move all checking logic to assemble_vintf.

Test: builds

Bug: 69636193
Change-Id: I2d62555633494014dc0005931de6c8ae9e6877fa
Merged-In: I2d62555633494014dc0005931de6c8ae9e6877fa
2017-12-14 15:35:15 -08:00
Yifan Hong
97de88c14e PRODUCT_COMPATIBILITY_MATRIX_LEVEL_OVERRIDE is deprecated.
It is replaced by FCM Version specified in the device manifest
directly.

Test: builds
Bug: 69636193
Change-Id: I9e2b871b4c6190107ba9fbb36495bb41c461a0a3
Merged-In: I9e2b871b4c6190107ba9fbb36495bb41c461a0a3
2017-12-14 15:35:15 -08:00
Dan Albert
6168f5baf1 Default NDK modules to libc++_shared.
Test: make native
Bug: None
Change-Id: I9ca2313c2082e9841a20e240ffca84219a419d49
2017-12-14 14:45:33 -08:00
Colin Cross
c212517c9b Merge "Add Soong modules to apkcerts" 2017-12-14 22:20:08 +00:00
Treehugger Robot
78b5724622 Merge "releasetools: Remove '-w' from ota_from_target_files options." 2017-12-14 22:18:56 +00:00
Dan Albert
248b832d44 Depend on the more specific ndk timestamp.
There are now two NDK sysroot timestamp files: ndk_base which depends
on the headers and stub libraries, and ndk which depends on ndk_base
and the static libraries. For building modules that need the NDK, we
only need to depend on the base sysroot.

Test: make native
Bug: None
Change-Id: I803032eda125a632d780c9cde10f47270491d0d2
2017-12-14 13:52:04 -08:00
Søren Gjesse
f2a697725c Enable R8 by default (second attempt)
Test: m -j PRODUCT-aosp_x86-userdebug
Test: Check that some .vdex files built have R8 generated code
Change-Id: I06903dc30c802bbcffd6992c3c25a1b711a5875c
2017-12-14 22:24:48 +01:00
Colin Cross
aec3640560 Add Soong modules to apkcerts
Bug: 70669383
Test: m apkcerts-list contains framework-res
Change-Id: I00c5c5d9e7311bbe4f16bf48407dd0efa242c7aa
2017-12-14 12:29:30 -08:00
bohu
680ab2effb emulator: disable location service
So that watchdog does not reboot the
system because location service is not
responding.

This is just to get emulator images
booting on aosp.

BUG: 70378659
Change-Id: I81277208e6b9f92bb56c11b072a1f108ea964bb7
Merged-In: I81277208e6b9f92bb56c11b072a1f108ea964bb7
2017-12-14 17:09:18 +00:00
Steven Moreland
0cf92b0c57 Expose Treble requirement variables in Soong.
As a followup to this, Treble will be removed. It's too generic
to be used with any reliability or meaning. Individual switches
also mean that they can be used independently.

Bug: 62019611
Test: manual
Change-Id: Ib1bd7d23510daac70a4520b9082f7492b8cbf027
2017-12-13 14:07:13 -08:00
Treehugger Robot
973301af79 Merge "Replace build/tools with build/make/tools" 2017-12-13 02:34:42 +00:00
Treehugger Robot
553de17d44 Merge "Define PLATFORM_VNDK_VERSION" 2017-12-13 01:49:41 +00:00
Justin Yun
2a233b3b86 Define PLATFORM_VNDK_VERSION
PLATFORM_VNDK_VERSION means the VNDK version that current build
provides. This value will be set to PLATFORM_SDK_VERSION once the
version is release. Otherwise, it will be set to "current".

Bug: 69883025
Test: device boot
Change-Id: I3fde4943aa062d9d148a3d7fc2798948870a48c6
2017-12-13 10:48:34 +09:00
Treehugger Robot
c0eabe6d34 Merge "Avoid feeding D8 with dex files." 2017-12-13 01:29:40 +00:00
Alan Leung
aff156bd49 Avoid feeding D8 with dex files.
Some test targets include dex files as resource to be loaded
at runtime. This is an issue since full D8 also take dex files
as input.

This CL extracts only the class files and feed that to D8 instead
of the whole jar.

Test: USE_D8_DESUGAR=true m checkbuild tests
Bug: 69329508

Change-Id: I52d80ec01933573f18eb497472a80b6a649c9dae
2017-12-12 15:51:25 -08:00
Colin Cross
f027511929 Merge "Add soong_docs to droidcore" 2017-12-12 23:02:55 +00:00
Dan Shi
fdc95fe0ca Create build artifact tradefed-tests_list.zip
Bug: 69678490
Test: m -j dist tradefed-tests-list
Change-Id: Ie70228f4c128b23c5d169fc8baafc6507386b541
2017-12-12 13:42:33 -08:00
Colin Cross
2c1da1e95f Add soong_docs to droidcore
Bug: 70516282
Test: treehugger
Change-Id: I818ad6f948502f4beb0205b583687c1d9fa563ac
2017-12-12 11:11:48 -08:00
Treehugger Robot
6553fd6cad Merge changes I8f20db07,Id3a8dd20,I0275a5d4
* changes:
  Enable VNDK runtime checking
  Add vintf into GSI
  Add a default apn-conf.xml into GSI
2017-12-12 04:50:26 +00:00
Isaac Chen
966e080ade Merge "Enable VNDK for aosp_x86 and aosp_x86_64" 2017-12-12 04:13:04 +00:00
Treehugger Robot
78b99fefd3 Merge "Add USE_D8_DESUGAR option in build/core" 2017-12-12 00:06:18 +00:00
Treehugger Robot
9098fd8905 Merge "base_rules.mk: Copy LOCAL_TEST_DATA to testcase folders." 2017-12-11 23:51:06 +00:00
Tobias Thierer
909a2d96f2 Merge "Revert "Build with OpenJDK 9 -target 1.8 by default except for errorprone."" 2017-12-11 22:57:51 +00:00
Alan Leung
eaafb3cd37 Add USE_D8_DESUGAR option in build/core
Add an option to use D8's desugar instead of the standalone version.

USE_D8_DESUGAR=true m would trigger DCHECK in dex2oat unless
https://android-review.googlesource.com/c/platform/art/+/562595 is
patched in as well.

Bug: 69329508
Test: m && USE_D8_DESUGAR=false m

Change-Id: I601dada44c361e45bbc0e2227ae1544a7d9efa90
2017-12-11 14:03:09 -08:00
Treehugger Robot
9874428159 Merge "Create an artifact to include TEST_MAPPING files in source code" 2017-12-11 20:42:46 +00:00
Tobias Thierer
3342e45722 Merge "Build with OpenJDK 9 -target 1.8 by default except for errorprone." 2017-12-11 19:06:07 +00:00
Tobias Thierer
bfa043039d Revert "Build with OpenJDK 9 -target 1.8 by default except for errorprone."
After this revert CL topic, the default toolchain for Android
goes back to being OpenJDK 8.

This revert is being prepared ahead of time in case of
any problems with CL topic:
https://r.android.com/#/q/topic:bug69449021_attempt2

Bug: 69449021
Test: Treehugger

Change-Id: I0ef41eff91e0d8437dc95e8569880f26f2529bc9
2017-12-11 14:21:37 +00:00
Tobias Thierer
ab1e54d5f1 Build with OpenJDK 9 -target 1.8 by default except for errorprone.
(This is cherry-picked from the first attempt to submit this CL
topic, which was reverted after 3 hours because of bug 70286093;
robolectric 3.{1.1,4.2} now stick with OpenJDK 8 to avoid that bug).

Before this CL topic, the build toolchain for .java source files
used OpenJDK 8, targeting 1.8 (v52 class files) by default.

This CL topic switches the default to OpenJDK 9, but still
targeting 1.8 (v52 class files) by default. If USE_ERROR_PRONE
is set to true, then the default remains OpenJDK 8.

Code in the Android platform should generally be unaffected,
but if host tools that are now compiled and run using
OpenJDK 9 are causing problems for your team, then let me
know.

To manually switch back to the old behavior for now (continue
using OpenJDK 8), run this command in your shell:
export EXPERIMENTAL_USE_OPENJDK9=false

Bug: 69449021
Test: Treehugger
Test: Running robolectric tests succeeds on internal-master
      after cherry-picking this CL topic, using the command
      line from http://b/70286093#comment1

(cherry picked from commit 5f36a62622)

Change-Id: I4972c714ed80c35328895e88675b56bf0e195c01
2017-12-11 14:21:37 +00:00
Søren Gjesse
5006ee95fc Merge "Revert "Enable R8 by default"" 2017-12-11 10:34:02 +00:00
Søren Gjesse
c2afe55679 Revert "Enable R8 by default"
This reverts commit 7fbc84686c.

Reason for revert: Build failures on oc-mr1-dev-plus-aosp, b/70486468.

Change-Id: I8c1bf38355b1e35748e065d39038c2aaf37c64af
Exempt-From-Owner-Approval: Revert due to build failures
2017-12-11 10:29:07 +00:00
Søren Gjesse
f93deb040d Merge "Enable R8 by default" 2017-12-11 07:29:06 +00:00
SzuWei Lin
596c026fd6 Enable VNDK runtime checking
GSI enabled "BOARD_VNDK_VERSION := current" on O-MR1,
but disabled VNDK runtime checking. This patch enables the checking

Bug: 69393797
Test: Build pass and boot to home screen on a Pixel device with GSI
Change-Id: I8f20db0798a07e63c453a9fe64638b99b41cd166
Merged-In: I8f20db0798a07e63c453a9fe64638b99b41cd166
(cherry picked from commit 7323f1d4ec)
2017-12-11 02:05:50 +00:00
Tao Bao
a7054eede1 releasetools: Fix the tag replacement for ro.build.vendor.fingerprint.
For devices using derived fingerprint (i.e. /system/build.prop doesn't
contain ro.build.fingerprint, but has ro.build.thumbprint instead), the
current code (in android.os.Build) doesn't have a matching logic to do
the same for ro.vendor.build.fingerprint. This means we will see
ro.build.thumbprint in /system/build.prop, while there's no matching
ro.vendor.build.thumbprint in /vendor/build.prop.

From signing script point of view, it should just apply the tag
replacement (e.g. test-keys -> release-keys) for whatever it sees when
signing a target_files.zip.

This CL also adds unit tests for EditTags() and RewriteProps().

Fixes: 27950003
Test: Use 'sign_target_files_apks.py' to sign a target that uses derived
      fingerprint and vendor partition. Check VENDOR/build.prop.
Test: python -m unittest test_sign_target_files_apks
Change-Id: I09019da970840cd82f54b68a32b4e94984bc1d8d
2017-12-08 15:19:47 -08:00
Søren Gjesse
7fbc84686c Enable R8 by default
Test: m -j PRODUCT-aosp_x86-userdebug
Test: Check that some .vdex files built have R8 generated code
Change-Id: I3c07cfce7db44fcc2e1bf99960da248558d4a686
2017-12-08 14:00:21 +01:00
Tao Bao
d4349f2106 build_image: Factor out CheckHeadroom() and add tests.
The test is mostly trivial, but it ensures the result parsing from
actual calls to mke2fs.

Test: python -m unittest test_build_image
Test: `m dist` on aosp_marlin-userdebug (w/ and w/o defining
      PRODUCT_SYSTEM_HEADROOM respectively).
Change-Id: I8b9964213950e76f6d7d5518414a1bab888b4706
2017-12-07 23:39:56 -08:00
SzuWei Lin
5cde531adb Add vintf into GSI
Bug: 70248004
Test: build pass and check the file in system image
Change-Id: Id3a8dd20e3de5dbba9d6ec222b32fed8817d300b
2017-12-08 11:07:35 +08:00
SzuWei Lin
f786f03656 Add a default apn-conf.xml into GSI
Add a default apn-conf.xml for telephony data network, then some
devices, ex. emulator, could use the default setting when it's
system image overrided by GSI.

Bug: 69869274
Test: build pass and boot a Pixel device with GSI to home screen
Change-Id: I0275a5d420eadcbb2f744e995c9a72a1fb46b935
2017-12-08 10:54:43 +08:00
Jaegeuk Kim
10c9f5d9d3 Merge "core, release: add sload.f2fs for otatools.zip" 2017-12-08 00:57:42 +00:00
Treehugger Robot
c6b28799e9 Merge "Create artifacts to include the list of test configs" 2017-12-08 00:43:20 +00:00
Treehugger Robot
68a6b90f6b Merge "Get off my lawn forever!" 2017-12-07 23:33:40 +00:00
Dan Shi
8f1263114b Create artifacts to include the list of test configs
Bug: 69678490
Test: m -j dist device-tests general-tests
confirm out/dist has device-tests_list.zip and general-tests_list.zip

Change-Id: I185bc66907e37aa5f5da70b2d1b838a73d5f1a51
2017-12-07 14:37:05 -08:00
Tao Bao
79d52f8798 Remove the support for BOARD_HAS_EXT4_RESERVED_BLOCKS.
This is only used in file-based OTA, where we may reserve space on
/system partition. With the deprecation of file-based OTA since O, the
code has become obsolete.

Test: `m dist`
Change-Id: I2bd686b292f93b566fe28a2bcd74c564ffc75dac
2017-12-07 14:36:21 -08:00
Treehugger Robot
3af39153a8 Merge "Create an artifact to include the list of integrated tests in TradeFed" 2017-12-07 22:07:43 +00:00