Commit Graph

40990 Commits

Author SHA1 Message Date
Tao Bao
80fb79f200 Merge "releasetools: Fix the bug that skips loading OEM dict."
am: 7889375102

Change-Id: If83ca048a4acdcdf079e3d6dd3b111181fbdc789
2017-12-21 17:51:48 +00:00
Treehugger Robot
7889375102 Merge "releasetools: Fix the bug that skips loading OEM dict." 2017-12-21 17:27:39 +00:00
Tobias Thierer
1d979598f5 Merge "Pass OpenJDK 8's bootclasspath for host tools targeting <= 1.8."
am: 1801a25d7c

Change-Id: Ibfc03e2be5ee7aab0ac024e6aa2e624cd2617603
2017-12-21 13:40:46 +00:00
Jiyong Park
d68d78c83e Merge "TARGET_COPY_OUT_[ODM|OEM] are exported to soong"
am: 2993eec041

Change-Id: I949776739b2bd9f09960fa2c285f0a4b04b810fe
2017-12-21 13:39:10 +00:00
Alan Leung
7269770b28 Merge "Add zip2zip as dependency of dexing step."
am: f0971be1b6

Change-Id: I50f7e9ca859006d9ddd552abe0ba20997b961895
2017-12-21 13:38:06 +00:00
Tobias Thierer
1801a25d7c Merge "Pass OpenJDK 8's bootclasspath for host tools targeting <= 1.8." 2017-12-21 11:46:20 +00:00
Treehugger Robot
2993eec041 Merge "TARGET_COPY_OUT_[ODM|OEM] are exported to soong" 2017-12-21 09:02:20 +00:00
Alan Leung
f0971be1b6 Merge "Add zip2zip as dependency of dexing step." 2017-12-21 08:00:06 +00:00
Tao Bao
2f5358d38b releasetools: Fix the bug that skips loading OEM dict.
The CL in [1] unintentionally breaks the OEM dict loading logic in the
incremental BBOTA path. We should always require and load the OEM
property dict if _either_ of the source and target builds uses OEM
properties. Otherwise with the current "and" operator, it skips loading
the OEM property dict and thus fails to generate an OTA package that has
OEM property changes (e.g. updating from build with fingerprint to
another one using thumbprint).

The CL in [1] actually makes the right change in the file-based OTA
path, but introduces the bug in the block-based OTA path.

This CL also cleans up the line that reads recovery_mount_options.

[1] commit 7f804ba71f ("releasetools:
allow for multiple OEM property values.").

Test: Genearte an OTA that has OEM property changes successfully.
Change-Id: Idce4ad59825d432618535ce09ab22bd7ddc524f2
2017-12-20 23:06:02 -08:00
Alan Leung
5eb88c0112 Add zip2zip as dependency of dexing step.
Bug: 69329508
Test: m checkbuild
Change-Id: I85f4508b6b1fee357d296bda6f0b6ba02cba70b7
2017-12-20 20:03:58 -08:00
Jiyong Park
9848be3581 TARGET_COPY_OUT_[ODM|OEM] are exported to soong
The two make vars are exported to soong as OdmPath and OemPath.

Bug: 68187740
Test: out/soong/soong.variables has OdmPath and OemPath each of which
points to 'odm' and 'oem'.
Change-Id: Ia283e4eb4aacc61b5b3c46e9001ea924566ea898
2017-12-21 12:13:13 +09:00
Tobias Thierer
7e99d45ec2 Pass OpenJDK 8's bootclasspath for host tools targeting <= 1.8.
Host (as opposed to hostdex) tools compile and run against OpenJDK's
core libraries. Before this CL, the core libraries of the default
toolchain were always used, even when targeting an earlier language
version.

This meant that code that uses APIs from a later version of OpenJDK
than corresponded to LOCAL_JAVA_LANGUAGE_VERSION would compile, but
would fail to run under that earlier version of OpenJDK. It also
meant that calls to existing APIs might be reinterpreted; for
example, the return type of java.nio.ByteBuffer.clear() changed from
Buffer in OpenJDK 8 to ByteBuffer in OpenJDK 9. At compile time, this
was noted via the warning:
  bootstrap class path not set in conjunction with -source 1.8

After this CL, when targeting a language version <= 1.8 (which is
always the case when building with OpenJDK 8), some of OpenJDK 8's
core library/tools jars are now passed on the bootclasspath. The
decision to include the bootclasspath argument when building with
OpenJDK 8 was somewhat arbitrary, but has the advantage that we
discover any issues before we switch to OpenJDK 9.

Even when compiling with OpenJDK 9, use of OpenJDK 9 APIs will now
fail at compile time rather than at runtime; calls to existing APIs
will now be interpreted in OpenJDK 8 rather than 9 fashion. For
example, this means that dx and host-side CTS tests built with
OpenJDK 9 javac -target 1.8 will be runnable under OpenJDK 8.

Bug: 70521453
Bug: 70862583
Test: Checked that the bootclasspath argument was passed
      in the javac invocation targeting 1.8 during:
      make showcommands compatibility-common-util-hostsidelib
Test: make checkbuild

Change-Id: I9b6081edfdd2c3e9a450ae8a39c4e32c3d2cda92
2017-12-21 01:38:44 +00:00
Jae Shin
83c829d9b1 Merge "Package NOTICE files and record LOCAL_PATHs"
am: 7f0e221942

Change-Id: Ie9e136057ff19792aa5e0fe81986c44d27969ec7
2017-12-21 01:15:14 +00:00
Justin Yun
9cd647af0c Merge "Do not enforce VNDK on GSI if VNDK version is not set"
am: 98acb09033

Change-Id: I71f6f9a3dbbc58e749bdd79ba082fdf166f8ce8e
2017-12-21 01:14:13 +00:00
Justin Yun
d2b7e0c9e5 Merge "Set BOARD_VNDK_VERSION=current as a default value"
am: 8950c2bb82

Change-Id: Ie0b2808c0a3e2b4b6311097d2501ad7aab40e31d
2017-12-21 01:13:26 +00:00
Justin Yun
bbbd85a172 Merge "Use PLATFORM_VERSION_CODENAME for VNDK version"
am: 5281020692

Change-Id: I77cf0006df96b6bfcbc3aab9eb9dbefbff450b00
2017-12-21 01:12:40 +00:00
Treehugger Robot
7f0e221942 Merge "Package NOTICE files and record LOCAL_PATHs" 2017-12-21 00:38:25 +00:00
Treehugger Robot
98acb09033 Merge "Do not enforce VNDK on GSI if VNDK version is not set" 2017-12-20 23:25:23 +00:00
Justin Yun
fc951ff268 Do not enforce VNDK on GSI if VNDK version is not set
If ro.vndk.version is not defined, use the namespace configuration
file that does not enforce VNDK restriction.
This is only for GSI.

Bug: 70704112
Test: Flash sailfish with PI and test with PI GSI image
Change-Id: Ic2b41357905ef47a3483b2eff635e8ae239e28aa
2017-12-21 08:24:36 +09:00
Treehugger Robot
8950c2bb82 Merge "Set BOARD_VNDK_VERSION=current as a default value" 2017-12-20 23:16:11 +00:00
Justin Yun
571737e8fc Set BOARD_VNDK_VERSION=current as a default value
For Android P or later launching devices, set BOARD_VNDK_VERSION to
"current" as a default value if the value is not defined yet.
"PRODUCT_USE_VNDK_OVERRIDE=false" can disable this feature.

Bug: 70480159
Bug: 62019611
Test: Unset BOARD_VNDK_VERSION
      Set PRODUCT_SHIPPING_API_LEVEL "28"
      - Check if BOARD_VNDK_VERSION is set to "current"
      Set PRODUCT_USE_VNDK_OVERRIDE to "false"
      - Check if BOARD_VNDK_VERSION is not defined

Change-Id: I8d37579e8c4ca1788705cbc8a42e8812e2b93a22
2017-12-21 08:15:19 +09:00
Treehugger Robot
5281020692 Merge "Use PLATFORM_VERSION_CODENAME for VNDK version" 2017-12-20 23:14:23 +00:00
Justin Yun
729856a5f2 Use PLATFORM_VERSION_CODENAME for VNDK version
Before Android version is released, we may use
PLATFORM_VERSION_CODENAME for PLATFORM_VNDK_VERSION to add version
suffix to VNDK directories.

Bug: 70584135
Test: Test youtube and RS apps
Change-Id: Ie788544740a5257232abc2c9acbce64749d15602
2017-12-21 08:13:32 +09:00
Steven Moreland
34ec026b5d Merge "Remove sepolicy_split from Soong."
am: a53865d108

Change-Id: Ifbb0c82ff708b73e7e922e207bf0b7e078ec2817
2017-12-20 19:15:48 +00:00
Treehugger Robot
a53865d108 Merge "Remove sepolicy_split from Soong." 2017-12-20 19:10:32 +00:00
Alan Leung
72b4e6605d Merge "Prep D8 default instead of CompatDX in build/core"
am: 326cd6637f

Change-Id: I9bdf5693dafa945adf79a553c24ea18bc8e903b8
2017-12-20 02:04:38 +00:00
Alan Leung
326cd6637f Merge "Prep D8 default instead of CompatDX in build/core" 2017-12-20 02:00:45 +00:00
Alan Leung
2a687a2073 Merge "Revert "Enable R8 by default (third attempt)""
am: 5260c8bdbc

Change-Id: Ibfddda7d59e1ee01967821ad8e1aa9b36e71a572
2017-12-19 23:50:38 +00:00
Alan Leung
5260c8bdbc Merge "Revert "Enable R8 by default (third attempt)"" 2017-12-19 23:46:13 +00:00
Alan Leung
c2cd517418 Revert "Enable R8 by default (third attempt)"
Bug: 70858752

This reverts commit 658e4e4e3a.

Reason for revert: breaks com.android.systemui.util.leak.LeakDetectorTest#trackInstance_doesNotLeakTrackedObject

which breaks presubmit

Change-Id: I6759cbef6dd5149ddb57836cd080829a5394473d
2017-12-19 23:45:15 +00:00
Steven Moreland
4b5c056216 Merge "Revert "Keep PRODUCT_FULL_TREBLE to true even when some requirements are not met""
am: eba55d2515

Change-Id: I16e095971a1b56e59b1efa6f6e1551fb224d9655
2017-12-19 20:37:50 +00:00
Steven Moreland
9634b1a0f3 Remove sepolicy_split from Soong.
No longer needed.

Bug: 62019611
Test: manual
Change-Id: I14a96d2f9dab24e446bccd79d2f0f13763f7a2e9
2017-12-19 12:35:26 -08:00
Treehugger Robot
eba55d2515 Merge "Revert "Keep PRODUCT_FULL_TREBLE to true even when some requirements are not met"" 2017-12-19 20:32:34 +00:00
Søren Gjesse
54c54f5eb5 Merge "Enable R8 by default (third attempt)"
am: 6f516aef40

Change-Id: I26e979f534cc67eeef196a966103bd519ea685d5
2017-12-19 18:19:23 +00:00
Alan Leung
c8ef37dfd8 Prep D8 default instead of CompatDX in build/core
Also use zip2zip to extract classes into another jar
to avoid hitting parameter limit in the shell invocations.

Bug: 69329508
Test: m checkbuild tests

Change-Id: Ic047aa699519b6b3fd100cb5395de945f96e4d0b
2017-12-18 23:54:33 -08:00
Søren Gjesse
6f516aef40 Merge "Enable R8 by default (third attempt)" 2017-12-19 07:12:05 +00:00
Tao Bao
0642ea4b4f Merge "build_image: Factor out CheckHeadroom() and add tests."
am: b379762089

Change-Id: I6a40a2de5a8ec2ded2f3f3a5f9b0e7f73c760a50
2017-12-19 00:35:02 +00:00
Treehugger Robot
b379762089 Merge "build_image: Factor out CheckHeadroom() and add tests." 2017-12-19 00:00:41 +00:00
Tao Bao
1296fef56c Merge "releasetools: Fix the tag replacement for ro.build.vendor.fingerprint."
am: b08567cbb6

Change-Id: Ie975c17ecabfc4d834826dffab0eddaa0dc82433
2017-12-18 22:24:22 +00:00
Tao Bao
4d45f51596 Merge "Remove the support for BOARD_HAS_EXT4_RESERVED_BLOCKS."
am: d30b75190d

Change-Id: I526c61f0176e3c028b77c19d4fc695ea6324beb0
2017-12-18 22:23:24 +00:00
Treehugger Robot
b08567cbb6 Merge "releasetools: Fix the tag replacement for ro.build.vendor.fingerprint." 2017-12-18 22:18:14 +00:00
Treehugger Robot
d30b75190d Merge "Remove the support for BOARD_HAS_EXT4_RESERVED_BLOCKS." 2017-12-18 22:17:46 +00:00
Baligh Uddin
d60a86c3ca Merge "Add generate_verity_key (+dependencies) to otatools package."
am: c4f76d670a

Change-Id: Ic6b4a610f9141446003826b325b5795cfc6e3fca
2017-12-18 20:44:30 +00:00
Baligh Uddin
c4f76d670a Merge "Add generate_verity_key (+dependencies) to otatools package." 2017-12-18 20:40:49 +00:00
Søren Gjesse
658e4e4e3a Enable R8 by default (third attempt)
Test: m -j PRODUCT-aosp_x86-userdebug
Test: Check that some .vdex files built have R8 generated code
Change-Id: I5ab4ed75493404c1b330827fe0005510f5613a68
2017-12-18 20:16:28 +01:00
Baligh Uddin
c8bef14c9f Add generate_verity_key (+dependencies) to otatools package. 2017-12-18 10:40:57 -08:00
Steven Moreland
a710d44086 Merge changes from topic "kati-obsolete-full-treble"
am: 2b1f0d1810

Change-Id: Ie267f97dc3fdd884a7a780d346880b7ff02d5d2e
2017-12-18 17:53:19 +00:00
Treehugger Robot
2b1f0d1810 Merge changes from topic "kati-obsolete-full-treble"
* changes:
  .KATI_obsolete PRODUCT_FULL_TREBLE.
  PRODUCT_NOTICE_SPLIT from PRODUCT_FULL_TREBLE
2017-12-18 17:46:25 +00:00
Steven Moreland
5dcea5de76 .KATI_obsolete PRODUCT_FULL_TREBLE.
It has been broken up into subflags, and usage has been cleaned up.

Bug: 69865032
Test: can't use PRODUCT_FULL_TREBLE
Change-Id: Ia38366a30132f129d09c6f4a985402c202bace62
2017-12-18 17:45:55 +00:00
Steven Moreland
27aaecaf1e Revert "Keep PRODUCT_FULL_TREBLE to true even when some requirements are not met"
This reverts commit 55e17a753e.

Reason for revert: Soong recognizes requirements.
Bug: 62019611
Test: still PRODUCT_FULL_TREBLE true on 2017 pixel

Change-Id: Id2b2186af5c9aa08e8f10ec2894f0f8d69f15d60
2017-12-18 17:44:16 +00:00