Commit Graph

41420 Commits

Author SHA1 Message Date
Tao Bao
b4a93bd4c8 Merge "releasetools: Remove the dead code for blockimgdiff_version <= 2." am: be8ea6ec11
am: d052700179

Change-Id: I7108f50d08d13026a5dd414f74f069714b9cf793
2017-12-21 22:37:13 +00:00
Tao Bao
d052700179 Merge "releasetools: Remove the dead code for blockimgdiff_version <= 2."
am: be8ea6ec11

Change-Id: I052877e554c87200101c40d53ebb3f51d00e5767
2017-12-21 22:28:36 +00:00
Dan Shi
26201a4d44 Merge "Auto generate test config files" am: 3c28ff7bff
am: 4ccd1a5a00

Change-Id: Ibc089081ab2925f8e3453eddf8c64d81d3b49596
2017-12-21 22:25:40 +00:00
Tao Bao
be8ea6ec11 Merge "releasetools: Remove the dead code for blockimgdiff_version <= 2." 2017-12-21 22:20:32 +00:00
Dan Shi
4ccd1a5a00 Merge "Auto generate test config files"
am: 3c28ff7bff

Change-Id: I4486412f640281276d5fc0cd7ac7ab27a03e879d
2017-12-21 22:12:45 +00:00
Dan Shi
3c28ff7bff Merge "Auto generate test config files" 2017-12-21 21:53:12 +00:00
Colin Cross
db2cc74d5c Merge changes I63eace8f,I103cbe58 am: 5ded399588
am: 0714643816

Change-Id: I38143faf090bf4b1d3c222438a45c66686811723
2017-12-21 21:02:39 +00:00
Colin Cross
0714643816 Merge changes I63eace8f,I103cbe58
am: 5ded399588

Change-Id: I6e22b7126e9b90a0ec4f0707a40d91925d143fb0
2017-12-21 20:58:19 +00:00
Treehugger Robot
5ded399588 Merge changes I63eace8f,I103cbe58
* changes:
  Remove obsolete leaf names
  Remove obsolete dx --no-locals when coverage is enabled
2017-12-21 20:49:03 +00:00
Tao Bao
0582cb639f releasetools: Remove the dead code for blockimgdiff_version <= 2.
The code is on infeasible path since we already have assertions in
common.BlockDifference().

Also remove the dead code that checks for OPTIONS.info_dict, as we
already set that in ota_from_target_files.main(), for both of A/B and
non-A/B.

Test: Generate incremental OTAs w/ and w/o the CL, and get identical
      packages.
Change-Id: Ifb8fc101e78f5ce58c60c8e49028b66ce0d20246
2017-12-21 11:53:27 -08:00
Tao Bao
a61ffc1291 Merge "releasetools: Fix the bug that skips loading OEM dict." am: 7889375102
am: 80fb79f200

Change-Id: Iac9c5c63886406aed585fe09c1ee9ba060a6a6cb
2017-12-21 18:01:30 +00:00
Tobias Thierer
153246ec83 Merge "Pass OpenJDK 8's bootclasspath for host tools targeting <= 1.8." am: 1801a25d7c
am: 1d979598f5

Change-Id: I4941142863c98fa60ea4dd2a80e52ebc8718bb8a
2017-12-21 18:00:09 +00:00
Jiyong Park
5f6f672fbf Merge "TARGET_COPY_OUT_[ODM|OEM] are exported to soong" am: 2993eec041
am: d68d78c83e

Change-Id: Iacf6804059b66c0b0e01258f52b426541968c18f
2017-12-21 17:58:30 +00:00
Alan Leung
af233a4dcf Merge "Add zip2zip as dependency of dexing step." am: f0971be1b6
am: 7269770b28

Change-Id: I651565a00739e8b102fc005ee41328297f724273
2017-12-21 17:57:40 +00:00
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
Isaac Chen
d82319aa41 Merge "Use proper make variable for vendor directory" into oc-mr1-dev-plus-aosp 2017-12-21 04:25:56 +00: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
Jae Shin
87661c862a Merge "Package NOTICE files and record LOCAL_PATHs" am: 7f0e221942
am: 83c829d9b1

Change-Id: Ib2068d22125992c229a9e5ed8c2954dd32deef19
2017-12-21 03:02:12 +00:00
Justin Yun
9b64392eb6 Merge "Do not enforce VNDK on GSI if VNDK version is not set" am: 98acb09033
am: 9cd647af0c

Change-Id: I245bbe8e7a16deb42b84599691e581c504d4615c
2017-12-21 03:01:19 +00:00
Justin Yun
a388e5c058 Merge "Set BOARD_VNDK_VERSION=current as a default value" am: 8950c2bb82
am: d2b7e0c9e5

Change-Id: I033018101516f78ddbd621353e8a477489324a05
2017-12-21 03:00:16 +00:00
Justin Yun
fa9d3b129a Merge "Use PLATFORM_VERSION_CODENAME for VNDK version" am: 5281020692
am: bbbd85a172

Change-Id: Ic1708ba5468e3628314e9e33a11657ba9f7ee87b
2017-12-21 02:59:24 +00: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
Colin Cross
a6e878219c Remove obsolete leaf names
classes-no-debug-var.jar is incorrect, jars in coverage builds
do have debug information.  Remove full_classes_compiled_jar_leaf
and hardcode classes-full-debug.jar.

After the previous patch, all dex files have debug information,
so remove the no-local and with-local directories and replace
them with dex/.

Remove the unnecessary jarjar_leaf.

Bug: 70886092
Test: m checkbuild
Change-Id: I63eace8f8cda5ad8bc0cbd11eefda73dd063ed76
2017-12-20 17:33:01 -08: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
Colin Cross
ff812829b6 Remove obsolete dx --no-locals when coverage is enabled
We use jacoco for coverage now instead of emma, so the workaround
is no longer necessary.

Bug: 70886092
Test: m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true SKIP_BOOT_JARS_CHECK=true WITH_DEXPREOPT=false
Change-Id: I103cbe58590689640a0b1520d22b3d3b7cd2208d
2017-12-20 17:03:52 -08: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
Dan Shi
efb892d858 Auto generate test config files
This change allows one to run atest <module name>. The TradeFed test
config file will be automatically created in testcases directory based
on the settings.

Bug: 69929803, 69932044
Test: m -j NotificationStressTests libminijail_test
add following lines in notificationtests/Android.mk,
before "include $(BUILD_PACKAGE)"
LOCAL_COMPATIBILITY_SUITE := general-test

Change-Id: Ib5e9cd152d957b5d5beb6ed23a899a021a7e06d6
2017-12-20 15:05:17 -08:00
Steven Moreland
2b28684175 Merge "Remove sepolicy_split from Soong." am: a53865d108
am: 34ec026b5d

Change-Id: Ic5aa6d96e7d373607535eedd637b0af03cb946a0
2017-12-20 19:24:16 +00: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
5d27234c6f Merge "Prep D8 default instead of CompatDX in build/core" am: 326cd6637f
am: 72b4e6605d

Change-Id: I79af6c36f046dd3a270180f261b56a2a6d54da43
2017-12-20 02:10:08 +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