Commit Graph

15331 Commits

Author SHA1 Message Date
Colin Cross eb196fe873 Merge "Remove --no-locals -> --release translation" am: d84332eed6
am: 9f8b5703b3

Change-Id: I867e4199d452d865f2f797bd67b2c71de75ae0e5
2017-12-22 02:03:24 +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 f6ba825c0f Merge "emulator: add check_emu_boot.mk" am: 9b04b2984c
am: 0b4a1edeae

Change-Id: Ice2df5213ec17a66d4e5f07a8c04d021f5dea10a
2017-12-22 01:45:54 +00:00
Treehugger Robot 9b04b2984c Merge "emulator: add check_emu_boot.mk" 2017-12-22 01:34:41 +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
Colin Cross f8b06a4e61 Update jacoco command line flags for latest version
jacoco_cli wants --quiet and --dest instead of -quiet and -dest.

Bug: 69669951
Test: m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true SKIP_BOOT_JARS_CHECK=true WITH_DEXPREOPT=false tests
Change-Id: I126a702fbb1538ba5f99a7abf70c1f025160db21
2017-12-21 14:09:51 -08: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 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
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
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
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
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
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 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
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
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
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
Sen Jiang 43935639fb Remove zlib_fingerprint support.
Test: m dist
Change-Id: I580993e5089b3eb73af0ee931dd222ebfd3a8593
2017-12-20 13:14:14 -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
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 326cd6637f Merge "Prep D8 default instead of CompatDX in build/core" 2017-12-20 02:00:45 +00:00
Alan Leung 4356ee61df Merge "Revert "Enable R8 by default (third attempt)"" am: 5260c8bdbc
am: 2a687a2073

Change-Id: Ic4d069d69cc142e49b52123f494c61c79600ccdc
2017-12-19 23:53:10 +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 df055ca4ef Merge "Revert "Keep PRODUCT_FULL_TREBLE to true even when some requirements are not met"" am: eba55d2515
am: 4b5c056216

Change-Id: Id1ba76beec7bbe93dbd2841fc6b8df4b26d92ac8
2017-12-19 20:41:41 +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 fd36ce9639 Merge "Enable R8 by default (third attempt)" am: 6f516aef40
am: 54c54f5eb5

Change-Id: I80a46db72c9714fcc9889d093055d2ad0a805ff8
2017-12-19 18:22:25 +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 3652c0ba76 Merge "Remove the support for BOARD_HAS_EXT4_RESERVED_BLOCKS." am: d30b75190d
am: 4d45f51596

Change-Id: Id6da54fe3f1cd4ebba63de849a065ffcd53b261e
2017-12-18 22:27:57 +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 10882a317c Merge "Add generate_verity_key (+dependencies) to otatools package." am: c4f76d670a
am: d60a86c3ca

Change-Id: I410319047ff19c0978e94a5a04e6a02083fccb24
2017-12-18 20:47:35 +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 9874ee6c54 Merge changes from topic "kati-obsolete-full-treble" am: 2b1f0d1810
am: a710d44086

Change-Id: I39b94bef18b12f0e55bc1d0eaabde2ba85f00146
2017-12-18 17:57:42 +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
Jae Shin 410a1af4f9 Package NOTICE files and record LOCAL_PATHs
Copy the NOTICE files for VNDK shared libs from
$(TARGET_OUT_NOTICE_FILES).
Create module_paths.txt to record the LOCAL_PATH for VNDK shared
libs. The LOCAL_PATH values are needed to read the SHA value
of a library's git project from manifest.xml.

Test: m -j vndk dist
Bug: 70603439
Change-Id: I9574abb48a472cb69440f3e9213ffdd0c1cac266
2017-12-18 12:33:08 +09:00
Dan Albert 892e4d3ec9 Merge "Depend on the more specific ndk timestamp." am: 6663c8476a
am: f6c5be1e8e

Change-Id: I3186e73b7779979081cb6d2a81d34079d2d65218
2017-12-16 03:22:34 +00:00
Treehugger Robot 6663c8476a Merge "Depend on the more specific ndk timestamp." 2017-12-16 03:14:43 +00:00
Chih-Hung Hsieh 322f7fd374 Merge "Call clang-tidy with -quiet unless WITH_TIDY is set." am: 305d2abb27
am: c1ddbf65be

Change-Id: I3bd0584158e60f67f7dcab5b9f6e02b54428811a
2017-12-16 01:59:20 +00:00
Treehugger Robot 305d2abb27 Merge "Call clang-tidy with -quiet unless WITH_TIDY is set." 2017-12-16 01:53:44 +00:00
Dan Albert 9b661597f6 Merge "Remove support for pre-r13 NDKs." am: 9d3270bd52
am: 28cc8a9c83

Change-Id: I2695424c9de939c26432480d17cf01116b996af1
2017-12-16 01:25:07 +00:00
Treehugger Robot 9d3270bd52 Merge "Remove support for pre-r13 NDKs." 2017-12-16 01:15:29 +00:00
Colin Cross 0293f40441 Merge "Fix swapped certificate and private key in soong apps" am: 9b93a8892a
am: 29e9b0f220

Change-Id: I9268bb95f0cbfc1b1054b9f51834d7f86e7581a8
2017-12-16 00:16:18 +00:00
Colin Cross 6a825da3d9 Merge "Export app implementation and header jars" am: 1ea9c644c8
am: e0beddc068

Change-Id: Ifecc3b40e86190d6c3a1fcd9886fd44c41cc5d63
2017-12-16 00:14:51 +00:00
Colin Cross 9b93a8892a Merge "Fix swapped certificate and private key in soong apps" 2017-12-16 00:04:07 +00:00
Colin Cross 1ea9c644c8 Merge "Export app implementation and header jars" 2017-12-16 00:00:24 +00:00
Chih-Hung Hsieh 6375b6d730 Call clang-tidy with -quiet unless WITH_TIDY is set.
* Default builds calls clang-tidy only if enabled locally.
  In this case, clang-tidy should be quiet.
* If WITH_TIDY is 1 or true, let clang-tidy emit default messages.
* Even with -quiet and all warnings are suppressed,
  clang-tidy emits one line message of the number of suppressed messages.
  This one-liner could be suppressed in future changes.

Bug: 69051430
Test: default build and build with WITH_TIDY=1
Change-Id: I3138ef45fc4372f904787bd1a391e8d88050f0b3
2017-12-15 15:41:14 -08:00
Dan Shi 638fdf443b Merge "Create build artifact tradefed-tests_list.zip" am: 8c2007cf4d
am: f23aa88514

Change-Id: Icb61400f9c88588fecf557155987dceff89827e6
2017-12-15 23:36:06 +00:00
Dan Albert 3d1d1ead79 Remove support for pre-r13 NDKs.
We only have r16 checked in now.

Test: make native
Bug: None
Change-Id: I1600598cf86f803f9fdcf3fa5ada8d1871c98b65
2017-12-15 15:25:06 -08:00
Treehugger Robot 8c2007cf4d Merge "Create build artifact tradefed-tests_list.zip" 2017-12-15 23:25:01 +00:00
Steven Moreland ae69e5787a PRODUCT_NOTICE_SPLIT from PRODUCT_FULL_TREBLE
- until PRODUCT_NOTICE_SPLIT is the default
- disallow PRODUCT_NOTICE_SPLIT_OVERRIDE because it
  doesn't need to be differentiated.

Bug: 69865032
Test: manual
Change-Id: I4a29c298862fc9fab51755bf19f236f61fbd784d
2017-12-15 14:52:07 -08:00
Dan Albert b86ff3828a Merge "Revert "Default NDK modules to libc++_shared."" am: aec47c67cd
am: 041ea591ae

Change-Id: I62e2cdbe3d88a60898140700e410f11592c48415
2017-12-15 21:51:39 +00:00
Colin Cross 4e34ce054c Fix swapped certificate and private key in soong apps
The .x509.pem file should be in CERTIFICATE, and the .pk8 file
in PRIVATE_KEY.

Bug: 70669383
Test: examine apkcerts.txt
Change-Id: I480f19be2efbbd72ea23ebd681f312b94accfd7a
2017-12-15 13:41:24 -08:00
Colin Cross 75a698b394 Export app implementation and header jars
Also fix a missing dependency on the jacoco-report-classes.jar

Test: m checkbuild
Change-Id: I67e924051e1029a409b82f2220811a27d5401db9
2017-12-15 13:41:24 -08:00
Treehugger Robot aec47c67cd Merge "Revert "Default NDK modules to libc++_shared."" 2017-12-15 21:39:29 +00:00
Steven Moreland a36a56b101 Merge "Remove Treble from soong_config.mk" am: b982d8b7ae
am: c4ee99f4ca

Change-Id: I2c5aa73b40e73951b57bfda52382eaeaab756788
2017-12-15 20:19:51 +00:00
Colin Cross fcb0d149b4 Revert "Revert "Support <dir>:<file> for LOCAL_JAVA_RESOURCE_FILES""
This reverts commit 15a2fa21a8.

This reapplies I83f3d45bdd156200308dc7ed0e0fea5d895d37a6 without
the error on absolute paths if they are in $(OUT_DIR).

BUG: 68305853
Test: OUT_DIR=/tmp/out mmma -j art/tools/ahat
Change-Id: Ia0b156d21ba4b95eb3004d61f6fae2f4341fd39c
Merged-In: Ia0b156d21ba4b95eb3004d61f6fae2f4341fd39c
2017-12-15 20:19:38 +00:00
Treehugger Robot b982d8b7ae Merge "Remove Treble from soong_config.mk" 2017-12-15 20:07:21 +00:00
Dan Albert 37099686c0 Revert "Default NDK modules to libc++_shared."
This reverts commit 6168f5baf1.

Reason for revert: http://b/70718590

Change-Id: I3e7afe3d1642260c2b5103cb07c636b0b5d72379
2017-12-15 20:01:03 +00:00
Joe Onorato fa839296ea Merge "When compiling with the lite protobuf option, pass the option to aprotoc to force the lite runtime." 2017-12-15 19:39:46 +00:00
Yifan Hong 23373452d4 Merge changes from topic "fcm_version" am: b1b5a0969b
am: 5ac5e6b757

Change-Id: I5e11aa05336756b2756cb19ae8fec94ca696c2c9
2017-12-15 19:13:04 +00:00
Yifan Hong b1b5a0969b Merge changes from topic "fcm_version"
* changes:
  Move fwk comp mat level logic into assemble_vintf
  PRODUCT_COMPATIBILITY_MATRIX_LEVEL_OVERRIDE is deprecated.
2017-12-15 18:58:34 +00:00
Steven Moreland 60b0f06d9b Remove Treble from soong_config.mk
This variable has been broken up into smaller components.

Bug: 62019611
Test: nothing uses it
Change-Id: Ic985e42179df24a43d9a0d0047a31ecd3bf35ec7
2017-12-15 10:26:52 -08:00
Steven Moreland 7c78b36d96 Merge "Expose Treble requirement variables in Soong." am: 4b7ab33f4e
am: 3b6bec05b2

Change-Id: Ib059e3fe14412178dde620d15f814021bb5cd5f5
2017-12-15 17:51:12 +00:00
Treehugger Robot 4b7ab33f4e Merge "Expose Treble requirement variables in Soong." 2017-12-15 17:41:28 +00:00
Joe Onorato bfc7811441 When compiling with the lite protobuf option, pass the option to aprotoc to force the lite runtime.
With LOCAL_PROTO_OPTIMIZE_TYPE set to one of the lite variants, the build system thinks
the proto should be compiled with lite, and will link in the line runtime libs. But if
the .proto files don't contain the directive to compile the source as lite
(option optimize_for = LITE_RUNTIME;), then the generated code will be full and the
libraries will be full, and it won't link.

Test: make
Merged-In: Ib8a135218d62fa42fa6448c49c97f7aeb2755c42
Change-Id: Ib8a135218d62fa42fa6448c49c97f7aeb2755c42
2017-12-15 08:40:48 -08:00
Søren Gjesse db48a0fccc Merge "Revert "Enable R8 by default (second attempt)"" am: adcd4c761d
am: a2e6d78ce6

Change-Id: I2c44fd88ff47eacd0f3696624484f866b0122357
2017-12-15 15:39:16 +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 529d047513 Merge "Enable R8 by default (second attempt)" am: 837408b4ca
am: f692713515

Change-Id: I11ce3614226ced16b0e8d335e2e394e0c22f3501
2017-12-15 11:15:28 +00:00
Søren Gjesse 837408b4ca Merge "Enable R8 by default (second attempt)" 2017-12-15 11:05:25 +00:00
TreeHugger Robot 85dcb56652 Merge "When compiling with the lite protobuf option, pass the option to aprotoc to force the lite runtime." into oc-mr1-dev-plus-aosp 2017-12-15 05:35:56 +00:00
Joe Onorato 3de3a74659 When compiling with the lite protobuf option, pass the option to aprotoc to force the lite runtime.
With LOCAL_PROTO_OPTIMIZE_TYPE set to one of the lite variants, the build system thinks
the proto should be compiled with lite, and will link in the line runtime libs. But if
the .proto files don't contain the directive to compile the source as lite
(option optimize_for = LITE_RUNTIME;), then the generated code will be full and the
libraries will be full, and it won't link.

Test: make
Merged-In: Ib8a135218d62fa42fa6448c49c97f7aeb2755c42
Change-Id: Ib8a135218d62fa42fa6448c49c97f7aeb2755c42
2017-12-14 19:58:43 -08:00
Dan Albert 9bd305948d Merge "Default NDK modules to libc++_shared." am: 587ced4a80
am: 1316e40597

Change-Id: Ibb40392071cfba45b1a20b07c73762111841a77d
2017-12-15 02:39:12 +00:00
Treehugger Robot 587ced4a80 Merge "Default NDK modules to libc++_shared." 2017-12-15 02:29:58 +00: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 e29acfd7f9 Merge "Add Soong modules to apkcerts" am: c212517c9b
am: f202d3f0c2

Change-Id: If7747c7cb3907a531e128cbb476ff0b88dc5c7f7
2017-12-14 22:30:52 +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
Adam Seaton c153a4b793 [DO NOT MERGE] Update security string to 2018-02-05 for oc-mr1-dev bug:70348883 am: fb5f3b5add am: 9e67329b15
am: e34617a4cc

Change-Id: I1faf5d1a8d1e2aeb35f6230f890cf74ef9651980
2017-12-14 20:17:12 +00:00
Adam Seaton e34617a4cc [DO NOT MERGE] Update security string to 2018-02-05 for oc-mr1-dev bug:70348883 am: fb5f3b5add
am: 9e67329b15

Change-Id: Ica0fc60b65b6bef7dd72de40c56e9fbdef2e2e64
2017-12-14 20:13:44 +00:00
Adam Seaton 9e67329b15 [DO NOT MERGE] Update security string to 2018-02-05 for oc-mr1-dev bug:70348883
am: fb5f3b5add

Change-Id: Ic0f372df927167d890bf29554bc737a6c4aa2b1b
2017-12-14 20:08:30 +00:00
Adam Seaton fb5f3b5add [DO NOT MERGE] Update security string to 2018-02-05 for oc-mr1-dev
bug:70348883

Change-Id: I3e6a87e66cd2c113d2f8fc0e9572b0a2744a6515
2017-12-14 17:30:59 +00:00
Adam Seaton 577d9eddc0 Merge "[DO NOT MERGE] Update security string to 2018-02-01 for oc-dev bug:70348883" into oc-dev am: 3c12119266 am: 07de097829
am: f1a38a2ef0

Change-Id: I874d361286412b3ee25c20c3c45389fefc034b8d
2017-12-14 02:21:41 +00:00
Adam Seaton f1a38a2ef0 Merge "[DO NOT MERGE] Update security string to 2018-02-01 for oc-dev bug:70348883" into oc-dev am: 3c12119266
am: 07de097829

Change-Id: Ifd5ff222586f78404a58ad1d73e03d01fcf983dc
2017-12-14 02:09:34 +00:00
Adam Seaton 07de097829 Merge "[DO NOT MERGE] Update security string to 2018-02-01 for oc-dev bug:70348883" into oc-dev
am: 3c12119266

Change-Id: I24ffbb6560091677f6bf71ae0c7c705eb2b894f2
2017-12-14 01:56:13 +00:00
Adam Seaton ee2346fa89 [DO NOT MERGE] Update security string to 2018-02-01 for oc-dev
bug:70348883

Change-Id: Ib87775083eb064c485a44dffcf3b4630d33d39c5
2017-12-13 23:02:17 +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
Colin Cross eb6c8444a6 Merge "Replace build/tools with build/make/tools" am: 973301af79
am: e6dc6b2026

Change-Id: Ie3eb9e2b411603f95f91cac79ebe56eb78423da3
2017-12-13 02:49:40 +00:00
Justin Yun ea0752140f Merge "Define PLATFORM_VNDK_VERSION" am: 553de17d44
am: db00ea991d

Change-Id: I351f15cc9ab934a9da95b24acb8e80410c5e93d2
2017-12-13 02:35:23 +00:00
Treehugger Robot 973301af79 Merge "Replace build/tools with build/make/tools" 2017-12-13 02:34:42 +00:00
Alan Leung dae5371f64 Merge "Avoid feeding D8 with dex files." am: c0eabe6d34
am: 6bba1f1ca2

Change-Id: Iac7057b19c71e0330a8f03b8f235a33ef1416651
2017-12-13 02:34:15 +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
Colin Cross c95bf7aa1d Merge "Add soong_docs to droidcore" am: f027511929
am: 5d8b68daca

Change-Id: Idac784ec8ef50063faa3d772b9b52beebd7a3b3a
2017-12-13 00:00:22 +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
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
Alan Leung 8de45264f6 Merge "Add USE_D8_DESUGAR option in build/core" am: 78b99fefd3
am: c2847897ff

Change-Id: Ibf1d288038c32866db2b1821718f1915e0a43905
2017-12-12 00:15:21 +00:00
Treehugger Robot 78b99fefd3 Merge "Add USE_D8_DESUGAR option in build/core" 2017-12-12 00:06:18 +00:00
Simran Basi 4a69393749 Merge "base_rules.mk: Copy LOCAL_TEST_DATA to testcase folders." am: 9098fd8905
am: d78d01deec

Change-Id: Ib7b39cfb570f093dac9c24637856b1542f403437
2017-12-12 00:05:15 +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 5d214a3844 Merge "Revert "Build with OpenJDK 9 -target 1.8 by default except for errorprone."" am: 909a2d96f2
am: fe1280f4e0

Change-Id: I457bc81cedf5d97148dd1abc2c0f8d2766be05c4
2017-12-11 23:11:44 +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
Dan Shi 2ac0a5d472 Merge "Create an artifact to include TEST_MAPPING files in source code" am: 9874428159
am: 3981526a34

Change-Id: I6433f33ccc6b21ba184321249303c05d4cbd2d1d
2017-12-11 20:57:55 +00: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 6bfcac877e Merge "Build with OpenJDK 9 -target 1.8 by default except for errorprone." am: 3342e45722
am: 1c64b02a4d

Change-Id: Ieef89169d6eb521823643f8bffb2815b6d0a35a2
2017-12-11 19:23:49 +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 a7632a0e98 Merge "Revert "Enable R8 by default"" am: 5006ee95fc
am: 9a6273a947

Change-Id: I3ca14e74a8e71663603a25ed68139f3e2aa84345
2017-12-11 10:44:06 +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 a942359cbb Merge "Enable R8 by default" am: f93deb040d
am: adf6c87cd0

Change-Id: If20a9c11a6d3194d0e59c85ad0b18ad22e99da02
2017-12-11 07:37:10 +00: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
Jaegeuk Kim cc1d0c982e Merge "core, release: add sload.f2fs for otatools.zip" am: 10c9f5d9d3
am: a5a2f10d79

Change-Id: Icbca3310a938e2c48d4e82c2dd1454fec2a05c92
2017-12-08 01:13:43 +00:00
Dan Shi aa9f05a409 Merge "Create artifacts to include the list of test configs" am: c6b28799e9
am: 00d3e58d1c

Change-Id: Ieba99654675f2c347f91f2ba0d41de970a86889c
2017-12-08 00:58:12 +00: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
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
Dan Shi 0c76aa1f03 Merge "Create an artifact to include the list of integrated tests in TradeFed" am: 3af39153a8
am: 477427a62c

Change-Id: Ia5e54d76c854084bc28926062e1dea721d0242e8
2017-12-07 22:19:20 +00: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
Colin Cross 3f74663fdf Merge changes Ia7feaa13,Ib917761e am: af3984d26d
am: c11df9e038

Change-Id: If160b8de399bbc77d1a9b7cc0efb37686cf27bea
2017-12-07 08:50:12 +00:00
Bo Hu 71900fc787 Merge "Revert "Renames sepolicy files from nonplat_* to vendor_*"" am: 94ea878ae0
am: 079a9f64ac

Change-Id: I11ee739b2990f166daaa6370874a29308f6bd60d
2017-12-07 08:29:54 +00:00
Colin Cross f2b5f371ff Merge "Add java modules to soong_to_convert.txt" am: fedcf41cc3
am: 2ea0ecdbfe

Change-Id: I0f5fd1e4fad03118989341b7b4de80c7ea4288c6
2017-12-07 08:27:52 +00:00
Treehugger Robot af3984d26d Merge changes Ia7feaa13,Ib917761e
* changes:
  Add dependency on jacoco-report-classes.jar
  Fix dex_preopt with profile on a soong module
2017-12-07 04:20:25 +00:00
Treehugger Robot 94ea878ae0 Merge "Revert "Renames sepolicy files from nonplat_* to vendor_*"" 2017-12-07 04:02:29 +00:00
Dan Shi da1ba69776 Merge "Add build script to generate TF test XML file with filters" am: 0765d53239
am: 515896c436

Change-Id: Id93e51733f0af93aff41e78ce2a1b92e2376befa
2017-12-07 03:58:20 +00:00
Dan Shi 515896c436 Merge "Add build script to generate TF test XML file with filters"
am: 0765d53239

Change-Id: I8ef4cee13232182a01c1bdc0da6afaf9ddd49e01
2017-12-07 03:49:57 +00:00
David Zeuthen 3f41c5ff1f Merge "AVB: If building recovery.img, add AVB hash footer." am: 7b2129f101
am: 0c1c47f700

Change-Id: I5adecf2f45d308312c545509fd80658f00755883
2017-12-07 02:17:17 +00:00
Dan Shi 567eede9b6 Create an artifact to include the list of integrated tests in TradeFed
In TF projects, we can add dir to COMPATIBILITY.tradefed_tests_dir to
include the test names in the artifact, e.g.,
LOCAL_PATH := $(call my-dir)
COMPATIBILITY.tradefed_tests_dir := \
  $(COMPATIBILITY.tradefed_tests_dir) $(LOCAL_PATH)/res/config

Bug: 69678490
Test: m -j dist tradefed-tests-list
Confirm out/dist/tradefed-tests-list.zip exists and has a file
tradefed-tests-list which contains the list of tests.

Change-Id: I67b82e5aeec68e9263bada198669b4a23a0750cb
2017-12-06 17:19:13 -08:00
Simran Basi 5691cb8b9a base_rules.mk: Copy LOCAL_TEST_DATA to testcase folders.
* Moves the test data logic up to before suite logic.
* Saves the source to relative dest pairs.
* Re-uses the saved source to relative dest pairs when generating
  the src:dst pairs for suites.

Bug: 69802886
Test: Build a native test with test data and ensured test data
      ended up in each arch specific destination folder.

Change-Id: I52cf8771487fb52276f5e6aae5b8eecb222544d7
2017-12-06 16:42:45 -08:00
Bo Hu 9eb4d74e26 Revert "Renames sepolicy files from nonplat_* to vendor_*"
This reverts commit 38c404c6da.
Reason for revert: broke mac build

b/70273082

FAILED: out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_sepolicy.cil
/bin/bash -c "(out/host/darwin-x86/bin/version_policy -b out/target/product/generic_x86/obj/FAKE/selinux_policy_intermediates/plat_pub_policy.cil -t out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_policy_raw.cil -n 10000.0 -o out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_sepolicy.cil.tmp ) && (grep -Fxv -f out/target/product/generic_x86/obj/ETC/plat_pub_versioned.cil_intermediates/plat_pub_versioned.cil out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_sepolicy.cil.tmp > out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_sepolicy.cil ) && (out/host/darwin-x86/bin/secilc -m -M true -G -N -c 30 		out/target/product/generic_x86/obj/ETC/plat_sepolicy.cil_intermediates/plat_sepolicy.cil out/target/product/generic_x86/obj/ETC/plat_pub_versioned.cil_intermediates/plat_pub_versioned.cil out/target/product/generic_x86/obj/ETC/10000.0.cil_intermediates/10000.0.cil out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_sepolicy.cil -o /dev/null -f /dev/null )"
Parsing out/target/product/generic_x86/obj/FAKE/selinux_policy_intermediates/plat_pub_policy.cil
Parsing out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_policy_raw.cil
grep: out of memory

Change-Id: I5b043fc6b5939456184ffb296cd00b3943a899f9
2017-12-07 00:16:35 +00:00
Colin Cross fdea893833 Replace build/tools with build/make/tools
Test: m checkbuild
Change-Id: I8db6c27a6d2372f142d10568fe92d6f2e9a59252
2017-12-06 16:12:40 -08:00
Colin Cross 8cd412feee Add dependency on jacoco-report-classes.jar
jacoco-report-classes.jar is found by a glob, so there is no
explicit dependency on it.  Add a dependency to javalib.jar so
that it gets installed.

Bug: 70295664
Test: m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_STATIC=true WITH_DEXPREPOT=false
Change-Id: Ia7feaa132879539f88c08a49148e4bbb5a141eab
2017-12-06 16:12:39 -08:00
Colin Cross d2e54d2362 Fix dex_preopt with profile on a soong module
The oreo merge to AOSP master added a new variable that must
be set when dex preopting a java module with a profile.

Test: m checkbuild
Change-Id: Ib917761ea4fea481e32f3fb663a18b882a13f4a1
2017-12-06 16:12:39 -08:00
David Zeuthen 0c1c47f700 Merge "AVB: If building recovery.img, add AVB hash footer."
am: 7b2129f101

Change-Id: I6b95aeb50a99a41831af4aa6374df3a6e8309ca4
2017-12-06 23:59:52 +00:00
Colin Cross 3277ba34ae Add java modules to soong_to_convert.txt
Test: examine soong_to_convert.txt
Change-Id: Ibb6db664238a4e98f5d8885dfb3ddc0f35d11ff6
2017-12-06 15:38:52 -08:00
Xin Li 5f03da0404 Merge "DO NOT MERGE: Merge Oreo MR1 into master" 2017-12-06 23:18:30 +00:00
Treehugger Robot 0765d53239 Merge "Add build script to generate TF test XML file with filters" 2017-12-06 22:51:43 +00:00
Treehugger Robot 7b2129f101 Merge "AVB: If building recovery.img, add AVB hash footer." 2017-12-06 22:12:25 +00:00
Jeff Gaston c0715eb231 Merge "Enable SKIP_BOOT_JARS_CHECK by default when instrumenting" am: 5313503663
am: a659799786

Change-Id: I878bdedce803df1b4e74c429901e1e04b7d73002
2017-12-06 21:43:29 +00:00
Jeff Gaston a659799786 Merge "Enable SKIP_BOOT_JARS_CHECK by default when instrumenting"
am: 5313503663

Change-Id: Iefc4b4cecb6f22b39ec66675fffe65ac62a18e79
2017-12-06 21:37:10 +00:00
Jeff Gaston 5313503663 Merge "Enable SKIP_BOOT_JARS_CHECK by default when instrumenting" 2017-12-06 21:28:28 +00:00
Badash d269f266aa initial add sts to build am: bb7a920294 am: b4bd17c9ad
am: 2f8a8b8a18

Change-Id: I34a6d4c7e16c0340d0a74bb1bcc2a29a2e850b1e
2017-12-06 18:34:32 +00:00
Badash 2f8a8b8a18 initial add sts to build am: bb7a920294
am: b4bd17c9ad

Change-Id: I94ff95c77545981dfe7e466e4e1a105f45e38472
2017-12-06 18:19:05 +00:00
Badash b4bd17c9ad initial add sts to build
am: bb7a920294

Change-Id: I63038aeb98fa6008e1217f8caf7ec749a0ea749e
2017-12-06 18:16:11 +00:00
Tobias Thierer e8ef654e04 Merge "Revert "Default to building with OpenJDK 9 -target 1.8."" am: 2ea4ed5911
am: a363f249e9

Change-Id: Iaa4ff98107045f5b3ffd19be8dcb61b168ebf7f1
2017-12-06 14:13:21 +00:00
Tobias Thierer a363f249e9 Merge "Revert "Default to building with OpenJDK 9 -target 1.8.""
am: 2ea4ed5911

Change-Id: I0fd225966b98a212b8c9712a4942cfe3e8bd9dc2
2017-12-06 14:09:31 +00:00
Tobias Thierer 2ea4ed5911 Merge "Revert "Default to building with OpenJDK 9 -target 1.8."" 2017-12-06 14:00:47 +00:00
Tobias Thierer 864b81d466 Merge "Build with OpenJDK 9 -target 1.8 by default except for errorprone." am: d4760b3eed
am: d148a93adc

Change-Id: Ia97ae88d072e1698bab9f7a15858f1a10bc015d6
2017-12-06 11:16:12 +00:00
Tobias Thierer d148a93adc Merge "Build with OpenJDK 9 -target 1.8 by default except for errorprone."
am: d4760b3eed

Change-Id: I051acf7e54d1fcbaf18943b11436d8566a2568a7
2017-12-06 11:09:39 +00:00
Tobias Thierer d4760b3eed Merge "Build with OpenJDK 9 -target 1.8 by default except for errorprone." 2017-12-06 11:05:31 +00:00
kaichieh 696e4eb092 Merge "Renames sepolicy files from nonplat_* to vendor_*" am: 291768ef7f
am: 24ed707951

Change-Id: If5bbb6e9dd954babaedbd060359dfa11d86b7ea3
2017-12-06 10:22:17 +00:00
kaichieh 24ed707951 Merge "Renames sepolicy files from nonplat_* to vendor_*"
am: 291768ef7f

Change-Id: Id4b56219d64a75c3697d7ab3aa9ea9223d40355e
2017-12-06 10:11:32 +00:00
Treehugger Robot 291768ef7f Merge "Renames sepolicy files from nonplat_* to vendor_*" 2017-12-06 10:00:46 +00:00
Jiyong Park ad0cb5a379 Merge "Don't embed vendor libs into vendor apks." am: 30c0278ae1
am: 65552d3c1d

Change-Id: I9edb24d2edceb9614573e797000e694d11bc7cc2
2017-12-06 04:27:14 +00:00
Jiyong Park 65552d3c1d Merge "Don't embed vendor libs into vendor apks."
am: 30c0278ae1

Change-Id: I16d8a9371b6ea699f22781eda61c345537bd73ef
2017-12-06 04:23:04 +00:00
Treehugger Robot 30c0278ae1 Merge "Don't embed vendor libs into vendor apks." 2017-12-06 04:14:43 +00:00
Jae Shin ebb2842dee Merge "Remove path prefix within VNDK snapshot zip" am: 18e945fb6e
am: ca989663e9

Change-Id: I28583d42fc8114698eb204668c8583a3ab8e61b8
2017-12-06 03:58:12 +00:00
Jae Shin ca989663e9 Merge "Remove path prefix within VNDK snapshot zip"
am: 18e945fb6e

Change-Id: I01b1f989c1e056e7aa5ad664d82cbb65658d4eeb
2017-12-06 03:40:36 +00:00
Jae Shin c13c0ea4b0 Remove path prefix within VNDK snapshot zip
Remove 'android-vndk-snapshot' path prefix when creating VNDK
snapshot zip with soong_zip. The path prefix makes it cumbersome
to unzip and install the snapshots to prebuilts/vndk/v{version}.

Test: development/vndk/snapshot/build.sh &&
python development/vndk/snapshot/update.py
Bug: 69950927
Change-Id: I9e5a1898056627ba98a408f048b7cb710e5ef07c
2017-12-06 01:41:07 +00:00
Badash bb7a920294 initial add sts to build
Test: Local build with other CLs in topic

Bug: 67456333
Change-Id: Ieea499fc22b6dff87dfb19fb8b9446fa449152ea
(cherry picked from commit a4560bb0cb)
2017-12-05 22:17:31 +00:00
Jaegeuk Kim 2ea1eba98c core, release: add sload.f2fs for otatools.zip
This also updates mkf2fsuserimg.sh to call sload.f2fs.

Change-Id: I245f6b3dfcd966fbc6783329d781375879fcd065
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
2017-12-05 10:59:50 -08:00
Dan Shi 679cc2a776 Create an artifact to include TEST_MAPPING files in source code
Bug: 69678490
Test: m dist -j test_mapping
Change-Id: I6436fdbb5c92ad840d166f42b9262eccdcdeb715
2017-12-04 21:42:27 -08:00
Tobias Thierer a4fc423ebf Revert "Default to building with OpenJDK 9 -target 1.8."
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 original change topic,
https://r.android.com/#/q/topic:bug_69449021

Bug: 69449021
Test: Treehugger

This reverts commit 3337fbfa6114379f13a35ad3d6bf9cb5a5b8689b

Change-Id: Ibc050ad9a87dceb336e7cd961015e70a639e43db
2017-12-05 02:10:02 +00:00
Tobias Thierer 5f36a62622 Build with OpenJDK 9 -target 1.8 by default except for errorprone.
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: "make core-oj", checked that compilation now uses
      OpenJDK 9 javac -target 1.8
Test: Checked that this is still compiled using OpenJDK 8.
      export EXPERIMENTAL_USE_OPENJDK9=false
      make core-oj

Change-Id: Iadae20d25e37d2cf0a89918a54af51fab1a4f01d
2017-12-05 02:10:02 +00:00
Justin Yun f4560ebb41 Merge "Check conformity of VNDK version" am: 6125d749ab
am: cb8136d054

Change-Id: I4ca79f1e567d07da2b999e13a0e54070b61e2a1e
2017-12-05 01:47:43 +00:00
Chih-Hung Hsieh 1ce563645f Merge "No need to dump modules added -Werror." am: 531ce804ea
am: 614877c921

Change-Id: I6784a6314940beb1d69f4cb413579e8c8e84a8f5
2017-12-05 01:46:36 +00:00
Colin Cross 2d9c3461fc Merge "Add support for LOCAL_GENERATED_SOURCES to droiddoc" am: 59dddf42a4
am: cf6b01c678

Change-Id: I4c300a05546bf0643afedd0e17019fa11a242e56
2017-12-05 01:40:27 +00:00
Justin Yun cb8136d054 Merge "Check conformity of VNDK version"
am: 6125d749ab

Change-Id: I9e4ded0975e6ba8d44658e40a59ed34a88a18c14
2017-12-05 01:38:18 +00:00
Chih-Hung Hsieh 614877c921 Merge "No need to dump modules added -Werror."
am: 531ce804ea

Change-Id: Ic8646bfe0d0c2e124ae32cfdc17c788d398e40b7
2017-12-05 01:37:16 +00:00
Colin Cross cf6b01c678 Merge "Add support for LOCAL_GENERATED_SOURCES to droiddoc"
am: 59dddf42a4

Change-Id: Iaf71dbf2fa724306ff60b770f834c0deaf7f80da
2017-12-05 01:29:31 +00:00
Treehugger Robot 6125d749ab Merge "Check conformity of VNDK version" 2017-12-05 01:24:54 +00:00
Treehugger Robot 531ce804ea Merge "No need to dump modules added -Werror." 2017-12-05 01:24:49 +00:00
Justin Yun 9272ef87a6 Check conformity of VNDK version
Allow BOARD_VNDK_VERSION=<version> only if the prebuilt VNDK for
the <version> is provided.

If PRODUCT_EXTRA_VNDK_VERSIONS is set, all the versions in the list
will be checked as well.

Bug: 38304393
Bug: 65377115
Bug: 68123344
Test: Set BOARD_VNDK_VERSION := current and check build
Test: Set PRODUCT_EXTRA_VNDK_VERSIONS := 27 and check if it returns
      error when prebuilts/vndk/v27/Android.mk is not provided

Change-Id: I2e43d71f1ea3717ab8c45de84c926ecc43193307
2017-12-05 10:23:44 +09:00
Steven Moreland af11e4ab51 Merge "Revert "Include Treble metadata on Treble enabled devices"" am: 79a55b3108
am: c8a55698ac

Change-Id: Id027e132c54dcf39aca2755e519dc923b03a0fa8
2017-12-05 01:16:59 +00:00
Colin Cross 59dddf42a4 Merge "Add support for LOCAL_GENERATED_SOURCES to droiddoc" 2017-12-05 01:08:41 +00:00
Colin Cross eb1012b1d4 Add support for LOCAL_GENERATED_SOURCES to droiddoc
BUILD_DROIDDOC allows LOCAL_SRC_FILES to refer to sources in
$(LOCAL_PATH) and LOCAL_INTERMEDIATE_SOURCES to refer to sources
in $(TARGET_OUT_COMMON_INTERMEDIATES).  The droiddoc rules that
use files generated in Soong were trying to abuse LOCAL_SRC_FILES
to point to files in $(OUT_DIR)/soong using ../.. to counter
$(LOCAL_PATH), but failed if $(OUT_DIR) was absolute.  Add
LOCAL_GENERATED_SOURCES that can take a path relative to the
top of the source tree or an absolute path.

Bug: 70166718
Test: m OUT_DIR=/tmp/out docs
Change-Id: Iaf0d622a3405da0bf520f7312e11e75e9328062e
Merged-In: Iaf0d622a3405da0bf520f7312e11e75e9328062e
(cherry-picked from commit 4c44a94dab)
2017-12-05 01:07:23 +00:00
Steven Moreland c8a55698ac Merge "Revert "Include Treble metadata on Treble enabled devices""
am: 79a55b3108

Change-Id: I54d681b2112ebc9b52784a5da3b15eed52a2f2de
2017-12-05 00:42:11 +00:00
Chih-Hung Hsieh ab149cbda0 No need to dump modules added -Werror.
* This reduces size of output file wall_werror.txt.
* Stop collecting $(MODULES_ADDED_WERROR)

Bug: 66996870
Test: normal build
Change-Id: Id750cc7fe6489a7654b20740d503226ec6941bbb
2017-12-04 15:23:37 -08:00
David Zeuthen 8fecb289ee AVB: If building recovery.img, add AVB hash footer.
In some non-A/B setups, recovery.img is still being used. If AVB is
enabled, we currently don't add a hash footer to recovery.img nor do
we include the hash digest in vbmeta.img. This CL fixes that.

This was tested on a build with the following settings

 TARGET_NO_RECOVERY := false
 BOARD_USES_RECOVERY_AS_BOOT := false
 BOARD_BUILD_SYSTEM_ROOT_IMAGE := false
 BOARD_RECOVERYIMAGE_PARTITION_SIZE := 33554432
 BOARD_AVB_RECOVERY_ADD_HASH_FOOTER_ARGS := --prop foo:bar

and then it was verified using 'avbtool info_image' that recovery.img
has a hash footer and a 'foo' property with the value 'bar'. This was
also checked successfully for vbmeta.img.

Test: See above.
Bug: None
Change-Id: I98124d5661ea768411416fa8d2a2ae6cc664fdc8
2017-12-04 13:54:38 -05:00
Steven Moreland 7a9b07f6fe Revert "Include Treble metadata on Treble enabled devices"
The test rather than the build system needs to check
the files according to the versions of the provided
device (and it does so now).

Fixes: 69864925
Test: clean revert, manual

(revert of cb5b8d2d47)

Change-Id: I1922190bfadca74d0652440fe61e29f22a846cf7
2017-12-04 09:37:39 -08:00
Colin Cross 39296fbc53 Merge "Pass PRODUCT_DEFAULT_DEV_CERTIFICATE to Soong" am: b8e08222d9
am: 37976b777b

Change-Id: I1d7b2d49d8e793d47d21351a9dfc22e25d2d108b
2017-12-02 04:50:36 +00:00
Colin Cross 37976b777b Merge "Pass PRODUCT_DEFAULT_DEV_CERTIFICATE to Soong"
am: b8e08222d9

Change-Id: Ifdeb490975206b5bd67a0471432c260a1614fdea
2017-12-02 04:46:16 +00:00
Treehugger Robot b8e08222d9 Merge "Pass PRODUCT_DEFAULT_DEV_CERTIFICATE to Soong" 2017-12-02 04:41:44 +00:00
Colin Cross 0e10ff54d4 Pass PRODUCT_DEFAULT_DEV_CERTIFICATE to Soong
Bug: 69917341
Test: m checkbuild
Change-Id: I66bac6c33432210f566a713478eb2b357f648a6d
2017-12-01 17:25:34 -08:00
Colin Cross ab47fd0947 Merge "Add support for RRO in soong app prebuilts" am: cd127ac860
am: 94b0dd3236

Change-Id: I80d1c91601fb03b8459e1378ba74c12aa1e7e4cd
2017-12-01 22:16:33 +00:00
Colin Cross 94b0dd3236 Merge "Add support for RRO in soong app prebuilts"
am: cd127ac860

Change-Id: I935b2f35e3642f2c8a4bf6f4e0b7ea8882df0bbc
2017-12-01 22:11:18 +00:00
Colin Cross cd127ac860 Merge "Add support for RRO in soong app prebuilts" 2017-12-01 22:05:42 +00:00
Tao Bao 9391595bbb Merge "Remove the redundant/wrong write of 'recovery_as_boot='." am: 4dd8610e26
am: 0ef0aef16b

Change-Id: I51314fa830ac8bc0014d8eb5fadadca85561ad72
2017-12-01 19:37:10 +00:00
Tao Bao 0ef0aef16b Merge "Remove the redundant/wrong write of 'recovery_as_boot='."
am: 4dd8610e26

Change-Id: Icf58943c1a3abb90c2a9a5aeb5175117c27be709
2017-12-01 19:33:22 +00:00
Treehugger Robot 4dd8610e26 Merge "Remove the redundant/wrong write of 'recovery_as_boot='." 2017-12-01 19:26:08 +00:00
Søren Gjesse c35d6f16c4 Merge "Prepare for switching from Proguard to R8" am: 6af8e92040
am: efbd35a247

Change-Id: Ibdb3a91401eeab8d9b9fddf738d359419887ea84
2017-12-01 06:50:23 +00:00
Søren Gjesse efbd35a247 Merge "Prepare for switching from Proguard to R8"
am: 6af8e92040

Change-Id: I26b648931723476a5cd0c9208c07352466abcc2c
2017-12-01 06:48:18 +00:00
Søren Gjesse 6af8e92040 Merge "Prepare for switching from Proguard to R8" 2017-12-01 06:41:51 +00:00
kaichieh 38c404c6da Renames sepolicy files from nonplat_* to vendor_*
Bug: 64240127
Test: normal boot and recovery boot a device
Change-Id: Ie30b4859d4d573cd2d35419195181695639f6582
2017-12-01 13:56:16 +08:00
Sundong Ahn e71a29b6c8 Merge changes from topic "system-api" am: 6e4e9f32ec
am: 1fa4c44c3b

Change-Id: I91f2547bc98b6afb73c7b7e0e9844b12a0fcc598
2017-12-01 04:30:19 +00:00
Sundong Ahn f4283c5ba6 Add LOCAL_SDK_VERSION := system_$(VER) am: 5a44d1f069
am: f3e8302088

Change-Id: I12795f38fb9ff499793b15f333117324e093436f
2017-12-01 04:29:52 +00:00
Sundong Ahn 1fa4c44c3b Merge changes from topic "system-api"
am: 6e4e9f32ec

Change-Id: I95cf7c414dbd1f45fa87b1d50bf2fe97c7994178
2017-12-01 04:26:54 +00:00
Sundong Ahn f3e8302088 Add LOCAL_SDK_VERSION := system_$(VER)
am: 5a44d1f069

Change-Id: Ief08f78484b654502d356c07d61063a16aad0572
2017-12-01 04:26:10 +00:00
Colin Cross 8c5ef24107 Add support for RRO in soong app prebuilts
Let soong pass overlay directories that were not used because
of enforced RROs and use the make rules to convert them to
the auto generated RRO package.

Bug: 69917341
Test: m checkbuild
Change-Id: I9db37e0bf65c19cef91428477713e3d7f1941b83
2017-11-30 20:22:12 -08:00
Treehugger Robot 6e4e9f32ec Merge changes from topic "system-api"
* changes:
  Fix build error
  Add LOCAL_SDK_VERSION := system_$(VER)
2017-12-01 04:19:45 +00:00
Sundong Ahn 3c113098f7 Fix build error
Fix the build error when TARGET_BUILD_APPS is set

Bug: 67724799
Test: m -j TARGET_PRODUCT=full TARGET_BUILD_APPS=TVTestInput

Merged-In: I981b0a245d7e8f2dabbd4e51db52d17aeacc6106
Change-Id: I981b0a245d7e8f2dabbd4e51db52d17aeacc6106
(cherry picked from commit 8e7a4c413f)
2017-12-01 00:40:56 +00:00
Sundong Ahn 5a44d1f069 Add LOCAL_SDK_VERSION := system_$(VER)
The system_$(VER) can be set in LOCAL_SDK_VERSION, and the apk will use
android_system.jar at build time.
If LOCAL_SDK_VERSION is not defined and this module is installed in
vendor.img, LOCAL_SDK_VERSION is set to system_current.

Bug: 67724799
Test: 1. build && run on taimen
2. LOCAL_SDK_VERSION:=system_27 in ims.apk && build ims.apk && check
the vsdk_v27_intermediates.

Merged-In: I5b11c78b8fcd4a2f2a5e3b141527cd34dbe80018
Change-Id: I5b11c78b8fcd4a2f2a5e3b141527cd34dbe80018
(cherry picked from commit ef212cbe8d)
2017-12-01 00:39:07 +00:00
Jae Shin c9110ae56a Merge "Include config files to VNDK snapshot" am: 2e42c54028
am: 6e11749f59

Change-Id: I8a00bbb9472867082f1cafa551ae1f373a88b831
2017-11-30 11:11:12 +00:00
Jae Shin 6e11749f59 Merge "Include config files to VNDK snapshot"
am: 2e42c54028

Change-Id: I8bd9c608258475747ec173eb4a3c2d91d460591a
2017-11-30 11:08:38 +00:00
Jae Shin 4736dc188e Include config files to VNDK snapshot
Additionally package ld.config.txt, llndk.libraries.txt,
vndksp.libraries.txt, vndkcore.libraries.txt,
vndkprivate.libraries.txt.

Also defer packaging TARGET_2ND_ARCH build outputs.

Test: m -j vndk dist
Test: development/vndk/snapshot/build.sh
Bug: 66059995
Change-Id: I2a85dde60824126dd16fd3732ddb0af8ae06d934
2017-11-30 11:04:06 +00:00
Dan Willemsen f5fe7af413 Merge changes from topic "clang_supported" am: 30f514cc51
am: d7ac0198d9

Change-Id: I80095e128b66de0ea5d295e7b4b2e707529bc74e
2017-11-30 08:15:55 +00:00
Dan Willemsen d7ac0198d9 Merge changes from topic "clang_supported"
am: 30f514cc51

Change-Id: Ie6327c5bdeab61452d19284761953acbba1598b7
2017-11-30 08:12:40 +00:00
Dan Willemsen 30f514cc51 Merge changes from topic "clang_supported"
* changes:
  Prepare for clang+mingw windows builds
  Fix / suppress warnings for clang+mingw
2017-11-30 08:05:58 +00:00
Søren Gjesse 896c30a65f Prepare for switching from Proguard to R8
Test: m -j PRODUCT-asop_x86-userdebug
Test: Check that no *.vdex files in the image are generated by R8

Change-Id: Ifd85d485fa5b6148723378a15c5faef849381ce1
2017-11-30 08:34:00 +01:00
Colin Cross 128a35eb66 Merge "Copy soong java prebuilts to classes-pre-proguard.jar" am: b8d6ac2150
am: 2228f62d03

Change-Id: I400fe53a51a7af3ac1b2913868f7abfa43d838b9
2017-11-30 06:35:56 +00:00
Colin Cross 2228f62d03 Merge "Copy soong java prebuilts to classes-pre-proguard.jar"
am: b8d6ac2150

Change-Id: I514048bfcca823269c7473baf17b6b8b2dae0e8d
2017-11-30 06:33:22 +00:00
Treehugger Robot b8d6ac2150 Merge "Copy soong java prebuilts to classes-pre-proguard.jar" 2017-11-30 06:27:21 +00:00
Dan Willemsen c01ad7b384 Prepare for clang+mingw windows builds
Use $(prefix)CLANG_SUPPORTED from Soong to control whether to use clang
for host builds or not. It's fairly general, but I only expect it to be
used to so that Windows builds can be switched between GCC and Clang
with a single switch.

Also separate native-host-cross from native-host so that it's easier to
build all possible windows modules.

Bug: 69933068
Test: m native-host-cross
Test: switch clang on and off, grep w64.*g++ out/build-aosp_arm.ninja
Change-Id: I205c5bc6739b72a539ece935381107ec1dd5bd48
2017-11-29 21:05:48 -08:00
Colin Cross ffa1cc020d Merge "Add support for app prebuilts from soong" am: 9b292d269e
am: 9541ce91c2

Change-Id: Ib161bd82513805d0372c0e8f85b4736933ce14e4
2017-11-30 04:56:19 +00:00
Colin Cross 9541ce91c2 Merge "Add support for app prebuilts from soong"
am: 9b292d269e

Change-Id: Ibbee4e2ca76659b4886ea629c6fa1d3b15ae9066
2017-11-30 04:52:43 +00:00
Colin Cross 9b292d269e Merge "Add support for app prebuilts from soong" 2017-11-30 04:49:20 +00:00
Colin Cross 6d0ca1f6cc Copy soong java prebuilts to classes-pre-proguard.jar
Some robolectric rules assume that classes-pre-proguard.jar
exists.  Soong doesn't support proguard yet, so copy classes.jar
to classes-pre-proguard.jar for now.

Bug: 69917341
Test: m checkbuild tests
Change-Id: I818363ec13c2e5e1c4ab5bd6389ea4687de953eb
2017-11-29 20:46:32 -08:00
Colin Cross e05e6df136 Add support for app prebuilts from soong
Allow soong to pass a built app to Make as a prebuilt .apk.

Bug: 69917341
Test: m checkbuild tests docs
Change-Id: I49dbe4c51c5b9f48fb82cb05b8eed7e3fe9fd4f6
2017-11-29 20:46:18 -08:00
Dan Willemsen 142a601bd3 Merge "Switch unused deprecated variables to obsolete" am: f170166521
am: f20b59e4d7

Change-Id: I978c3b5aeb7329e35220648b3f24101e7cf1568b
2017-11-30 02:13:37 +00:00
Dan Willemsen f20b59e4d7 Merge "Switch unused deprecated variables to obsolete"
am: f170166521

Change-Id: Ibe1d991ea61eb953fa161d0e2a04faac1c6309f4
2017-11-30 02:10:49 +00:00
Dan Willemsen f170166521 Merge "Switch unused deprecated variables to obsolete" 2017-11-30 01:49:11 +00:00
Jeff Gaston 6ec6943683 Merge "Export PRODUCT_SOONG_NAMESPACES to Soong" am: 9ddf8ea3a5
am: 4db75cfb63

Change-Id: If3371fb160aea129e4a3c637389f231cc9fffcdc
2017-11-30 00:20:38 +00:00
Jeff Gaston 4db75cfb63 Merge "Export PRODUCT_SOONG_NAMESPACES to Soong"
am: 9ddf8ea3a5

Change-Id: Ia3fe844259d7808477e286b68edbf51e29631e7d
2017-11-30 00:15:32 +00:00
Dan Willemsen 79fd696939 Switch unused deprecated variables to obsolete
These have no references in our master trees, so can now be marked as
obsolete.

Test: grep -R "<VAR> has been" <all build_test logs>
Change-Id: I72d2371176e78f38ed56741dd8527193eec7eae3
2017-11-29 13:44:32 -08:00
Jeff Gaston 1fe28d332e Export PRODUCT_SOONG_NAMESPACES to Soong
Bug: 65683273
Test: put 'PRODUCT_SOONG_NAMESPACES := jeff-test/dir1' \
      in a .mk file and observe its value copied into \
      out/soong/soong.variables

Change-Id: I2b61caa46f40f35ccecf64da88918b73180e02e8
2017-11-29 13:17:13 -08:00
Kevin Cheng be6e0d066b Merge "Add local compatibilty suite info to module-info.json." am: ada8948b9a
am: 0026cf4d5b

Change-Id: I944e2ddb1a03f349b1678b9c1ce63c4e03ea45e8
2017-11-29 20:38:00 +00:00
Kevin Cheng 0026cf4d5b Merge "Add local compatibilty suite info to module-info.json."
am: ada8948b9a

Change-Id: I6b8c3da9231bf4cb0d3a9aae12e3b0d8e25cef8c
2017-11-29 20:30:47 +00:00
Treehugger Robot ada8948b9a Merge "Add local compatibilty suite info to module-info.json." 2017-11-29 20:20:25 +00:00
Bowgo Tsai d2daa37931 Merge "Reorder assert-max-image-size and AVB signing" am: 8552bebed4
am: 91676f9154

Change-Id: If32fe42e5cddd41664deafb58ccb1c02aa2ee56b
2017-11-29 09:21:09 +00:00
Bowgo Tsai 91676f9154 Merge "Reorder assert-max-image-size and AVB signing"
am: 8552bebed4

Change-Id: I9f8c0e513cee50740b31b26c18e72c9c7284b5c1
2017-11-29 09:17:35 +00:00
Treehugger Robot 8552bebed4 Merge "Reorder assert-max-image-size and AVB signing" 2017-11-29 09:10:27 +00:00
Bowgo Tsai 6a74979a3b Include vbmeta.img into <product>-img.zip
Bug: 65227202
Test: make dist, checks vbmeta.img is included in <product>-img.zip
Merged-In: I3e09f036441bcf7e98d8f76360df1e17466ae38e
Change-Id: I3e09f036441bcf7e98d8f76360df1e17466ae38e
(cherry picked from commit 6bbb11a620)
2017-11-29 16:14:19 +09:00
Michael Schwartz 366ba1e30d Merge "Support prebuilt bootimage" am: 52a4f7d2b7
am: 465197ed16

Change-Id: Ibd6f0f298f78735fd1978a4e7956c5f4aa0e665f
2017-11-29 04:55:54 +00:00
Michael Schwartz 465197ed16 Merge "Support prebuilt bootimage"
am: 52a4f7d2b7

Change-Id: I6f84da11655b151b65c4e3913fc14aa8b6631b97
2017-11-29 04:52:49 +00:00
Treehugger Robot 52a4f7d2b7 Merge "Support prebuilt bootimage" 2017-11-29 04:44:20 +00:00
Dan Willemsen 7aa261d33e Merge "Mark envsetup.sh vars as deprecated in makefiles" am: d7fcf6f459
am: efe230cef6

Change-Id: Icb40e3041e47fe87d7d1a9ee5112a66aa297be55
2017-11-29 03:25:21 +00:00
Dan Willemsen efe230cef6 Merge "Mark envsetup.sh vars as deprecated in makefiles"
am: d7fcf6f459

Change-Id: I7da6187dc23bf7e74dbb7e8b686380070f565f70
2017-11-29 03:18:43 +00:00
Treehugger Robot d7fcf6f459 Merge "Mark envsetup.sh vars as deprecated in makefiles" 2017-11-29 03:06:32 +00:00
Kevin Cheng 2260918434 Add local compatibilty suite info to module-info.json.
Test: m out/target/product/<lunch target>/module-info.json
And I see the following line in module-info.json:

"CtsSampleHostTestCases": { "class": ["JAVA_LIBRARIES"],  "path":
["cts/hostsidetests/sample"],  "tags": ["tests"],  "installed":
["out/host/linux-x86/framework/CtsSampleHostTestCases.jar"],
"compatibility_suites": ["cts",  "general-tests",  "vts"] },

Change-Id: I67a78de4153c762977b145ed62ca8b6ecd0b7947
2017-11-28 15:27:04 -08:00
Jayant Chowdhary 8add887830 Merge "Export DIST_DIR to soong on dist builds." am: 824958e880
am: 26f40c264d

Change-Id: I4c68f459eeee7b34d39d369b2c1e8339c3cb8506
2017-11-28 22:53:28 +00:00
Jayant Chowdhary 26f40c264d Merge "Export DIST_DIR to soong on dist builds."
am: 824958e880

Change-Id: Ic7c2f097e5c19cf80ce3b0b2c6ce170f908907b9
2017-11-28 22:46:56 +00:00
Jayant Chowdhary 824958e880 Merge "Export DIST_DIR to soong on dist builds." 2017-11-28 22:38:32 +00:00
Dan Willemsen 773386251d Mark envsetup.sh vars as deprecated in makefiles
For the envsetup.sh variables that should not be used in makefiles
(since they're not explicitly set up, and won't be available on the
build servers), mark them as deprecated.

Rework our documentation to have a landing page, and create a "Changes"
section where we can record changes like these. At some point I may go
and backfill some recent work.

Test: build/soong/build_test.bash
Change-Id: I54b9294ddf270245afdb58d17150db8098584e8a
2017-11-28 14:19:50 -08:00
Colin Cross f58de03da6 Merge "Add support for jacoco in soong" am: 9798690282
am: 863dcf07d4

Change-Id: I7c8f67093167c75318ef8ba7b0bc86077434f25f
2017-11-28 21:25:23 +00:00
Colin Cross 863dcf07d4 Merge "Add support for jacoco in soong"
am: 9798690282

Change-Id: I47534d7346e637aff019b10bfc395254c618d29c
2017-11-28 21:18:48 +00:00
Colin Cross c6bbdc86dc Merge "Add LOCAL_SRCJARS to clear_vars.mk" am: edd5f3810f
am: 7ae502ff64

Change-Id: Ifc061bf79cd7d0641da8209fee9c2a92dfd13745
2017-11-28 19:49:04 +00:00
Colin Cross 7ae502ff64 Merge "Add LOCAL_SRCJARS to clear_vars.mk"
am: edd5f3810f

Change-Id: I894b5d2f2ac84eef65e6fdcf22c968317d4072b2
2017-11-28 19:45:40 +00:00
Jayant Chowdhary 85fbcf4a68 Export DIST_DIR to soong on dist builds.
Bug: 64267858

Test: Adding DistDir to build/soong/android/variable.go enables access
      to DIST_DIR_SOONG.

Change-Id: I74faea11255edf37db6a4eaf193df300c363bfb7
2017-11-28 11:26:24 -08:00
Michael Schwartz 0dc6f21779 Support prebuilt bootimage
Bug: 63676296
Test: `m -j` and inspect artifacts
Merged-In: Id32d8a7151a8e99b45aa58ee9971def9734eaf78
Change-Id: Id32d8a7151a8e99b45aa58ee9971def9734eaf78
(cherry picked from commit b0b1a24b1e)
2017-11-28 20:18:34 +09:00
Colin Cross 3fec81d978 Add support for jacoco in soong
Use jacoco values exported from soong and copy
jacoco-report-classes.jar to where the jacoco-report-classes-all.jar
rule can find it.

Bug: 69629238
Test: m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true SKIP_BOOT_JARS_CHECK=true WITH_DEXPREOPT=false
Change-Id: If05381f415fb52a575746b8be0bfcd03d55b2153
2017-11-24 20:23:36 -08:00
Colin Cross 98341ab6d6 Add LOCAL_SRCJARS to clear_vars.mk
I064889c9063b642835d9f668e2568b61d0fabe35 added LOCAL_SRCJARS but
forgot to clear it in clear_vars.mk.

Test: m checkbuild
Change-Id: I7d4e6a3821db0eccb25042091aa599cab381a1b0
2017-11-24 11:26:43 -08:00
Andreas Gampe b49b0276ee Merge "Build: Make dex2oat boot image error abort explicit" am: 87dded4494
am: f1d0d93fa2

Change-Id: I305650e2cbc3d523ffa236b282a29da10b3ec469
2017-11-23 02:05:14 +00:00
Andreas Gampe f1d0d93fa2 Merge "Build: Make dex2oat boot image error abort explicit"
am: 87dded4494

Change-Id: I44e5a6cf2fa976dddd882107ffc152a602778fd9
2017-11-23 02:00:05 +00:00
Treehugger Robot 87dded4494 Merge "Build: Make dex2oat boot image error abort explicit" 2017-11-23 01:56:06 +00:00
Colin Cross 431ac167d5 Merge "Tighten restrictions on LOCAL_JACK_COVERAGE_(INCLUDE|EXCLUDE)_FILTER" am: 711bfabd50
am: 2338f237a3

Change-Id: I3bc4845e1e2e3ec8aafafc7a80354738069b67b5
2017-11-22 22:39:59 +00:00
Colin Cross 2338f237a3 Merge "Tighten restrictions on LOCAL_JACK_COVERAGE_(INCLUDE|EXCLUDE)_FILTER"
am: 711bfabd50

Change-Id: If9f4d81504c26e3d752d4f10f161f9229fb68a8d
2017-11-22 22:37:23 +00:00
Colin Cross 711bfabd50 Merge "Tighten restrictions on LOCAL_JACK_COVERAGE_(INCLUDE|EXCLUDE)_FILTER" 2017-11-22 22:30:18 +00:00
Andreas Gampe 5ccf0900d0 Build: Make dex2oat boot image error abort explicit
Add explicit arguments that will abort boot image compilation when
a class is found that fails compile-time verification.

This allows certain configurations to disable these checks.

WARNING: Disabling the checks is highly discouraged.

Bug: 69106371
Test: m
Change-Id: I63e915005fcda588b223ec60ef8c9db28d42e577
2017-11-22 14:16:24 -08:00
Bowgo Tsai 03b9c8e637 Reorder assert-max-image-size and AVB signing
This change fixes the following warning message:
  WARNING: out/target/product/$(TARGET_DEVICE)/boot.img approaching \
  size limit (33554432 now; limit 33554432)

This is because AVB signing will increase boot.img to
BOARD_BOOTIMAGE_PARTITION_SIZE, in order to place the AVB metadata at
the end of the partition. We should check max image size first then use
avbtool to sign it.

The max allowed size will be (partition size - AVB_HASH_META_SIZE) when
AVB is enabled.

Note that some projects don't have BOARD_{BOOT,RECOVERY}IMAGE_PARTITION_SIZE,
we should skip assert-max-image-size for it.

Finally, this CL also fixes the build error for `make bootimage-nodeps`
when AVB is used.

Bug: 69115400
Test: build and checks there is no size limit warning message
Change-Id: I54f28c6f1c9fe9ed88c1d73e5cb72b3693593f9b
2017-11-22 17:46:33 +08:00
Colin Cross 3c8d30ce60 Tighten restrictions on LOCAL_JACK_COVERAGE_(INCLUDE|EXCLUDE)_FILTER
Jack supported '?' and '*' wildcards anywhere in a filter. Tighten
the restrictions to only support '*' at the end of a filter, and
to disallow '?'.  This will allow jacoco support to be built on
top of the existing zip2zip tools.

Add checks that all filters meet the new requirements, and run
the checks outside the LOCAL_EMMA_INSTRUMENT==true check so that
mistakes can be caught without having to run a build with
coverage enabled.

Bug: 69629238
Test: m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_STATIC=true
Test: m in internal master
Test: https://android-build.googleplex.com/builds/view-workplan?viewType=Table&workplanId=L67200000122054710&nodeType=Trybot
Change-Id: Ib78bd3c8685fbc6bdcdb517df874186efd1cff33
2017-11-22 01:49:47 +00:00
Tomasz Wasilczyk ddbd872e1d Merge "Silence yet more superfluous build messages." am: 01e1fe60b8
am: c792d08bd2

Change-Id: I009eb004485f9ce1c818403d5a24712833f44224
2017-11-22 01:27:35 +00:00
Tomasz Wasilczyk c792d08bd2 Merge "Silence yet more superfluous build messages."
am: 01e1fe60b8

Change-Id: I5dc1676389d4b6fb062265fac86a9d77b37c5c7b
2017-11-22 01:25:29 +00:00
Tomasz Wasilczyk 01e1fe60b8 Merge "Silence yet more superfluous build messages." 2017-11-22 01:20:32 +00:00
Vishwath Mohan d949357589 Merge "Use the .cfi variant of a static library where needed." am: 061fcfc254
am: 9cdabdad04

Change-Id: I74bf38385e3a1102549774fae60219f92943043b
2017-11-22 00:16:00 +00:00
Vishwath Mohan 9cdabdad04 Merge "Use the .cfi variant of a static library where needed."
am: 061fcfc254

Change-Id: I668b215133aa51ad29695fc15f842f4de71645aa
2017-11-22 00:12:17 +00:00
Treehugger Robot 061fcfc254 Merge "Use the .cfi variant of a static library where needed." 2017-11-22 00:05:30 +00:00
Vishwath Mohan 96a130bdaf Use the .cfi variant of a static library where needed.
This CL repoints static dependencies to their .cfi variants for CFI
enabled targets. It also disables CFI for host targets because the
version of ar intended for hosts does not have plugin support (which
CFI requires).

Bug: 67507323
Test: m -j40
Change-Id: Id11afd0c8765469858f406aace2a192afff6d042
2017-11-21 14:08:20 -08:00
Chih-hung Hsieh 1b942a9fc3 Merge "Add default -Wall -Werror or -Wall." am: 6ddc7843cb
am: 39610026fb

Change-Id: I8a5258cd8077788504dfdfef67c66337e75f3547
2017-11-21 21:28:20 +00:00
Chih-hung Hsieh 39610026fb Merge "Add default -Wall -Werror or -Wall."
am: 6ddc7843cb

Change-Id: Ib9b93dbd61bb9141b88fb7f1f7c4ead3fd28accc
2017-11-21 21:24:12 +00:00
Chih-hung Hsieh 6ddc7843cb Merge "Add default -Wall -Werror or -Wall." 2017-11-21 21:19:01 +00:00
Jiyong Park 4744c8e71d Merge "Ensure partition_tag is always set correctly" am: dcbc2e9a26
am: 9afd210a78

Change-Id: I7b9eceb8b5f47f6ed1ca4a35fe1d2f560e7d17dd
2017-11-21 04:17:17 +00:00
Jiyong Park 9afd210a78 Merge "Ensure partition_tag is always set correctly"
am: dcbc2e9a26

Change-Id: I446d0eecd17c19fade90dd4b7e7a195f2a3d1d5a
2017-11-21 04:14:40 +00:00
Treehugger Robot dcbc2e9a26 Merge "Ensure partition_tag is always set correctly" 2017-11-21 04:09:21 +00:00
Bowgo Tsai 940d45fb04 Merge "Revert "Reorder assert-max-image-size and AVB signing"" am: aac41d585c
am: 8dbeec4e9e

Change-Id: I801fd6661d73260417ab2f13b740918181341bd0
2017-11-21 03:09:40 +00:00
Bowgo Tsai 8dbeec4e9e Merge "Revert "Reorder assert-max-image-size and AVB signing""
am: aac41d585c

Change-Id: I5e8b881da8588f7bb1730d49e0e35eb6aab9728a
2017-11-21 03:07:05 +00:00
Bowgo Tsai aac41d585c Merge "Revert "Reorder assert-max-image-size and AVB signing"" 2017-11-21 03:02:19 +00:00