Commit Graph

41021 Commits

Author SHA1 Message Date
Jae Shin a085258968 Merge "Add check to ensure PLATFORM_VNDK_VERSION is set"
am: 13349ed3c2

Change-Id: Ibae825f9cc56606a01905f1b7bae9778275c0064
2017-12-26 01:55:07 +00:00
Treehugger Robot 13349ed3c2 Merge "Add check to ensure PLATFORM_VNDK_VERSION is set" 2017-12-26 01:51:20 +00:00
Steven Moreland 152a886de3 Merge "Allow devices to extend the system manifest."
am: 15820578b2

Change-Id: I23cbded9ac506c201bc4f8378dca124a68402f2e
2017-12-23 01:22:33 +00:00
Treehugger Robot 15820578b2 Merge "Allow devices to extend the system manifest." 2017-12-23 01:17:24 +00:00
Justin Yun cc3924fd67 Merge "Use current VNDK directories if version is not set on GSI"
am: a5af4d920f

Change-Id: I6e5abd1191bd469765c5f610bb47d4b1c1baf22f
2017-12-23 00:41:24 +00:00
Treehugger Robot a5af4d920f Merge "Use current VNDK directories if version is not set on GSI" 2017-12-23 00:35:23 +00:00
Dan Shi 4647f8125a Merge "Test config should use manifest package attribute"
am: a6c3cece9e

Change-Id: Iad499856cef0be99d8f6af260d05c70c9200bc78
2017-12-22 23:38:44 +00:00
Treehugger Robot a6c3cece9e Merge "Test config should use manifest package attribute" 2017-12-22 23:31:42 +00:00
Justin Yun c104764f73 Use current VNDK directories if version is not set on GSI
Only for GSI, if "ro.vndk.version" property is not defined, the
vendor modules will use current version of VNDK libs.

Bug: 70704112
Test: On Android-P sailfish device, install GSI and check boot
Change-Id: Ib8eb28604ab3e33474179dffbc07358921e7439c
2017-12-23 08:16:59 +09:00
Steven Moreland b14b530f82 Allow devices to extend the system manifest.
Introduces DEVICE_FRAMEWORK_MANIFEST_FILE, a list
of files which are added to system/manifest.xml.
This is required for devices to properly display
what hals they implement and also therefore for
them to pass vts_treble_vintf_test since it
now tests manifests based on hal origin.

Notice, this is named singularly to match
DEVICE_MANIFEST_FILE which is also a list of files.
They may be better both named "FILES", but for
consistency and legacy reasons, they can be thought
of as "everything that composes the X manifest
file".

Fixes: 70042049
Test: add system manifest extension which needs it
  and it no longer fails vts_treble_vintf_test for
  hals being served from the wrong partitions.

Change-Id: I1f59d5c3cadb7a7d4576b73196ca7b41103a49c5
2017-12-22 14:02:11 -08:00
Dan Shi 9a50168c85 Test config should use manifest package attribute
Bug: 70981774,69929803
Test: m -j SetupWizardActivityTests
Change-Id: I6d50744504eac71d6ecae5db9b14e6d30eb923fe
2017-12-22 13:34:50 -08:00
Tobias Thierer e63e713ce3 Merge "Revert "emulator: add check_emu_boot.mk""
am: 1d87b803f7

Change-Id: I036c4cb23396dbb747852b1c6e52fd3db2a9e2bb
2017-12-22 15:14:33 +00:00
Treehugger Robot 1d87b803f7 Merge "Revert "emulator: add check_emu_boot.mk"" 2017-12-22 15:10:16 +00:00
Tobias Thierer e01a5759b7 Revert "emulator: add check_emu_boot.mk"
This reverts commit bba0ef24c2.

Reason for revert: Broke aosp_arm64_ab-userdebug build on internal master.

Change-Id: I04ca552174bc2731cb69ee8485d50f4c190c0d27
2017-12-22 13:31:41 +00:00
Colin Cross 9f8b5703b3 Merge "Remove --no-locals -> --release translation"
am: d84332eed6

Change-Id: I448d47a81efb31537d976c84cbe38031507f89f5
2017-12-22 02:00:53 +00:00
Treehugger Robot d84332eed6 Merge "Remove --no-locals -> --release translation" 2017-12-22 01:53:24 +00:00
Jae Shin 0b1792e29b Add check to ensure PLATFORM_VNDK_VERSION is set
Bug: 70918357
Test: m -j vndk dist
Change-Id: Ia4ae94db9feccb7c40edfe90c14eb552b69ef655
2017-12-22 10:46:51 +09:00
bohu 0b4a1edeae Merge "emulator: add check_emu_boot.mk"
am: 9b04b2984c

Change-Id: I72c8bf4d94b520922b63e0eb2c7e63aeb713c50a
2017-12-22 01:40:48 +00:00
Treehugger Robot 9b04b2984c Merge "emulator: add check_emu_boot.mk" 2017-12-22 01:34:41 +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
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 aca57b6c89 Remove --no-locals -> --release translation
--no-locals is never used any more, remove the translation.

Bug: 70886092
Test: m checkbuild
Change-Id: I5b0a512601b417c5a10001feed1fd9b8de8cb983
2017-12-21 13:00:51 -08: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 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
bohu bba0ef24c2 emulator: add check_emu_boot.mk
"make check_emu_boot" will boot up emulator
and check whether it boots up or timed out.
On boot success, it will emit a file
BOOT_SUCCESS.txt in dist_dir;
On timed out, it will emit a file
BOOT_FAIL.txt in dist_dir.

Change-Id: I152228806175c116a5adceb8429b66cf829edd22
2017-12-20 21:24: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
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