Commit Graph

41721 Commits

Author SHA1 Message Date
Treehugger Robot ce5e4e251e Merge "Mark ANDROID_BUILD_TOP as obsolete" 2018-01-04 13:35:34 +00:00
Tobias Thierer d7b2ec09d9 Merge "Build with OpenJDK 9 -target 1.8 by default (attempt 4)." am: 1644e2f1b7
am: a902b41648

Change-Id: I5f6e9fdde1d6d2d5f042d3301910cb5e0ddfe180
2018-01-04 11:28:56 +00:00
Tobias Thierer a902b41648 Merge "Build with OpenJDK 9 -target 1.8 by default (attempt 4)."
am: 1644e2f1b7

Change-Id: Iafd0db73afc0d6ce831eb97f1bafbc1cd04fb8f4
2018-01-04 11:24:54 +00:00
Tobias Thierer 1644e2f1b7 Merge "Build with OpenJDK 9 -target 1.8 by default (attempt 4)." 2018-01-04 11:18:11 +00:00
Tobias Thierer 294111393e Build with OpenJDK 9 -target 1.8 by default (attempt 4).
This is cherry-picked from attempt 3, which was reverted
due to http://b/70862583.

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: art/test/testrunner/run_build_test_target.py -j40 art-interpreter
Test: dalvik/dx/tests/run-all-tests

(cherry picked from commit ab1e54d5f1)

Change-Id: I119be15bd95747722114b970400b740fa47bf9e0
Merged-in: Ic42a518c90515b497e5cecec444ded373e403a4b
2018-01-04 11:08:14 +00:00
Chih-Hung Hsieh 4d31b9da8c Call clang-tidy with -fno-caret-diagnostics by default.
* clang -fno-caret-diagnostics
  suppresses warning source lines, carets, and
  the stats line of "n warnings generated"
* clang-tidy -extra-arg-before=-fno-caret-diagnotics
  only suppresses the "n warnings generated" line.
* Pass this flag and -quiet to clang-tidy when
  WITH_TIDY is not 1 or true.
* Remove redundant quotation marks around -extra-arg-before.

Bug: 69051430
Test: normal build and build with WITH_TIDY=1

Change-Id: I9021ee315edc977c15dda6ab246a00182f31fad1
2018-01-04 01:31:37 -08:00
Jae Shin 240d97a249 Apply snapshot variant to vndk package module name
VNDK snapshot phony package, vndk_v$VER, is redefined to
separate phony packages per VNDK snapshot build variant,
vndk_v$VER_$VARIANT, where $VARIANT is defined as the primary
$TARGET_ARCH of the build target.

Accordingly, top level Android.bp file under prebuilts/vndk/v$VER
is redefined as separate Android.bp files for each snapshot
variant at prebuilts/vndk/v$VER/$VARIANT/Android.bp.

Test: m -j PRODUCT_EXTRA_VNDK_VERSIONS=27 (after installing
snapshot to prebuilts/vndk/v27)
Bug: 71370248

Change-Id: Ida449978090fe8a4f16376c991d34fa0945be596
2018-01-04 10:23:19 +09:00
Jae Shin 893fca6e46 Additionally package TARGET_2ND_ARCH variants
Redefine VNDK snapshot top level dir with $(TARGET_PRODUCT) and
additionally package TARGET_2ND_ARCH build variants of libs since
they are needed by 32bit processes running on a 64bit device.

Test: m -j vndk dist
Bug: 71370248
Change-Id: I8c6953f1b52b61caf413559bab56b294479b6d86
2018-01-04 10:23:10 +09:00
Jae Shin 77c07dd6d0 Apply change in prebuilt names for config files
The suffix for VNDK config files ld.config.txt,
llndk.libraries.txt, and vndksp.libraries.txt has been changed to
*.$(PLATFORM_VNDK_VERSION).txt.

Refactor the paths-of-intermediates function such that instead of
parsing filenames from list of modules within the function,
provide the function a list of preprocessed
module_name:file_name pairs.

Bug: 70918357
Test: m -j vndk dist
Change-Id: I2d69b7822cef4c709e15a53f99c7ab2efb22406c
2018-01-04 10:07:30 +09:00
Colin Cross 08cf35feb9 Merge changes from topic "soong_r8" am: 8798bb70da
am: c9f5afb07e

Change-Id: I63a8dc3bac882d80a5ff0ea531b7a32c10e0793c
2018-01-04 00:20:40 +00:00
Colin Cross c9f5afb07e Merge changes from topic "soong_r8"
am: 8798bb70da

Change-Id: Ib400887c09869f01730681824b71a95ce3847fb4
2018-01-04 00:17:14 +00:00
Colin Cross 8798bb70da Merge changes from topic "soong_r8"
* changes:
  Add R8 support to Soong.
  Fix dependency on Soong jacoco report classes
2018-01-04 00:12:49 +00:00
Dan Willemsen 07699636b0 Mark ANDROID_BUILD_TOP as obsolete
All users have been removed.

Test: check the build_test logs from aosp/master -> goog/master
Change-Id: I99e5630d7c13882c7667b0499c4f55633fa4535a
2018-01-03 15:15:38 -08:00
Colin Cross b9f8265d08 Merge "Remove LOCAL_PROGUARD_ENABLED := nosystem" am: 2c2cb33830
am: d61a376ec4

Change-Id: I3f0c780471bc63ee8bc45db6c508522b7e679f65
2018-01-03 22:32:25 +00:00
Colin Cross d61a376ec4 Merge "Remove LOCAL_PROGUARD_ENABLED := nosystem"
am: 2c2cb33830

Change-Id: I5af52911e6c497ea5888e7f8add9f6d86c2443fe
2018-01-03 22:28:46 +00:00
Colin Cross d31ff8ff32 Fix adbs after move from build/tools to build/make/tools
adbs broke when build/tools was moved to build/make/tools in
aosp/286781.

Bug: 15270043
Test: build/tools/adbs
Change-Id: I0a34b2b446f996bcc53a7dde6381402f8eed9bd0
2018-01-03 14:21:35 -08:00
Colin Cross 5e0986cb51 Add R8 support to Soong.
Move R8_COMPAT_PROGUARD definition to Soong.
Copy the proguard_dictionary file so that the find
command that builds proguard_dict.zip can find it.

Test: m checkbuild
Change-Id: I28b2fce26ccb6225be0bd71802a43fe63df85daa
2018-01-03 14:21:35 -08:00
Colin Cross dc4a6b8513 Use proguard.jacoco.flags for EMMA_INSTRUMENT_STATIC
Add proguard.jacoco.flags whenever EMMA_INSTRUMENT_STATIC is set
so that com.vladium.emma.rt.RT is not stripped.

Test: m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_STATIC=true
Change-Id: Ie64a283d95e8bbf426cd39675d70a3a58768ebc7
2018-01-03 14:21:35 -08:00
Colin Cross 20e06d25ac Fix dependency on Soong jacoco report classes
The dependency on the Soong jacoco report classes was mistakenly
using $(common_javalib.jar) which was never set, so was using
the value from the last module.  Use $(LOCAL_BUILT_MODULE)
instead.

Test: m checkbuild
Change-Id: If502d67f9e5e0c107de44e96cbf232406c027e44
2018-01-03 14:21:35 -08:00
Colin Cross 2c2cb33830 Merge "Remove LOCAL_PROGUARD_ENABLED := nosystem" 2018-01-03 22:20:41 +00:00
Colin Cross 2fec0b5d97 Merge "Move jacoco before desugar" am: f9a1e6a72a
am: c06ecd9a99

Change-Id: If465e2dcac6fa905210ae2905b453b903581418d
2018-01-03 21:01:38 +00:00
Colin Cross c06ecd9a99 Merge "Move jacoco before desugar"
am: f9a1e6a72a

Change-Id: I2b0117e0a3395341ef7a4e489bf90ed1d50124e9
2018-01-03 20:57:27 +00:00
Colin Cross f9a1e6a72a Merge "Move jacoco before desugar" 2018-01-03 20:50:50 +00:00
Colin Cross b305326ae4 Merge "Update jacoco command line flags for latest version" am: 03cdfcc631
am: 3b45c545ea

Change-Id: I499e5e84d2a3b043d2103a36d5ff8fb428be898c
2018-01-03 20:11:57 +00:00
Colin Cross 3b45c545ea Merge "Update jacoco command line flags for latest version"
am: 03cdfcc631

Change-Id: I35621f756c4dbde34243dd37a2881b9aeb9f5fa3
2018-01-03 19:57:36 +00:00
Tao Bao c72727ac3f releasetools: Clean up build_image.py.
Mostly cosmetic changes, such as moving print statement to print
function. The only functional change is to wrap the file opening in
Append() with try statement, which would dump the error message as
needed.

Test: `m dist`
Test: python -m unittest test_build_image
Change-Id: I4e6c593517cf737bfcbe51bc533b22a247b10e44
2018-01-03 11:52:28 -08:00
Tao Bao d8a953d7ab releasetools: Move assertions into CheckHeadroom().
Assert the input arguments inside CheckHeadroom() function, and add
matching tests. Also use common.MakeTemp{File,Dir} in tests.

Test: `m dist`
Test: python -m unittest test_build_image
Change-Id: Ib45f24651af9591a9cfdd72aac3558f6c9a80f44
2018-01-03 11:52:16 -08:00
Tao Bao 413a88b386 Merge "releasetools: Clean up ReplaceVerityKeyId and add tests." am: b35128521d
am: 2a0f657c56

Change-Id: I0da4fccfbf7d6873de59e5a019cb13f3414e3b40
2018-01-03 19:46:56 +00:00
Colin Cross 03cdfcc631 Merge "Update jacoco command line flags for latest version" 2018-01-03 19:45:55 +00:00
Tao Bao 2a0f657c56 Merge "releasetools: Clean up ReplaceVerityKeyId and add tests."
am: b35128521d

Change-Id: I8125eb37ed2dcde206d6fb659ea77b0ab6db7cde
2018-01-03 19:40:52 +00:00
Treehugger Robot b35128521d Merge "releasetools: Clean up ReplaceVerityKeyId and add tests." 2018-01-03 19:35:21 +00:00
Tao Bao 9c097cf8a7 Merge "releasetools: Add common.MakeTempDir()." am: ec728cbad0
am: 043544035e

Change-Id: I1ac5a296f9af4b3989642e1bf6cfc623fa72404f
2018-01-02 23:37:38 +00:00
Tao Bao 043544035e Merge "releasetools: Add common.MakeTempDir()."
am: ec728cbad0

Change-Id: Ib9b3249c62c70cdf708bad246a239057213fe77a
2018-01-02 23:34:09 +00:00
Treehugger Robot ec728cbad0 Merge "releasetools: Add common.MakeTempDir()." 2018-01-02 23:25:35 +00:00
Colin Cross e616f34431 Remove LOCAL_PROGUARD_ENABLED := nosystem
None of the system options are controversial, and there are no
longer any users of nosystem, so remove it.

Test: m checkbuild
Change-Id: Id1b946d83688d266ca2942c02c97e8b404c3755b
2018-01-02 13:18:04 -08:00
Tao Bao e838d1446c releasetools: Clean up ReplaceVerityKeyId and add tests.
Test: python -m unittest test_sign_target_files_apks
Test: Run sign_target_files_apks.py on marlin target_files.zip.
Change-Id: Ic3c3f4f14c73f8f8e48a8341e024e0861e665989
2018-01-02 12:29:31 -08:00
Tao Bao 1c830bfbaa releasetools: Add common.MakeTempDir().
This simplifies the work to track mkdtemp()'d dirs. This CL also cleans
up the temporary file creation in build_image.py.

Test: `m dist`
Test: python -m unittest test_common
Change-Id: Ied7d86126714b9b26e5df7bcca1dfdea21cfcf60
2018-01-02 12:22:01 -08:00
Tao Bao 2b8f63693e Merge "releasetools: Clean up sign_target_files_apks.py." am: 7d100ce03b
am: 336f2cce7d

Change-Id: Idb8b486616222a809e34d61d721e8f3f2a6d41ae
2018-01-02 20:05:56 +00:00
Tao Bao 3859f0d09f Merge "releasetools: Fix a bug in blockimgdiff.HeapItem." am: a5e3a258fd
am: 442be8f1e5

Change-Id: I81040b7cb4acbd4ea791a0eb9b251b8d39cabfe3
2018-01-02 20:02:22 +00:00
Tao Bao 336f2cce7d Merge "releasetools: Clean up sign_target_files_apks.py."
am: 7d100ce03b

Change-Id: Iaf34dbeadd8352231592edb518101851ac959c63
2018-01-02 20:02:15 +00:00
Tao Bao 442be8f1e5 Merge "releasetools: Fix a bug in blockimgdiff.HeapItem."
am: a5e3a258fd

Change-Id: I38d4611c51ec511169c727dbfcbe6c2243fcab62
2018-01-02 19:58:58 +00:00
Treehugger Robot 7d100ce03b Merge "releasetools: Clean up sign_target_files_apks.py." 2018-01-02 19:56:03 +00:00
Treehugger Robot a5e3a258fd Merge "releasetools: Fix a bug in blockimgdiff.HeapItem." 2018-01-02 19:52:09 +00:00
Tao Bao 0c28d2d02d releasetools: Clean up sign_target_files_apks.py.
Mostly cosmetic changes, such as replacing print statement with print
function. Also change 'import cStringIO' to optionally look for the one
in io module, to allow Python 2/3 compatibility.

Test: pylint --rcfile=pylintrc sign_target_files_apks.py
Test: Run sign_target_files_apks.py on marlin target_files.zip.
Change-Id: I4dc98b01da6f89e624114bbca5522f659901c1f2
2018-01-02 09:57:29 -08:00
Tao Bao 186ec99eb9 releasetools: Fix a bug in blockimgdiff.HeapItem.
HeapItem defines __bool__(), which contains a logical error that should
return the opposite value.

Note that the bug only manifests while using Python 3, which calls
__bool__(). With Python 2, `if x:` or bool(x) actually calls
x.__nonzero__() or x.__len__(). If a class defines neither __len__() nor
__nonzero__(), as the case in HeapItem, it always returns True.

Test: python -m unittest test_blockimgdiff
Test: python3 -m unittest test_blockimgdiff
Test: Generate an incremental non-A/B OTA package successfully.
Change-Id: Ibe8430e0b495a7d2f430cfffb716d2536ffb53d2
2018-01-02 09:54:32 -08:00
Dan Shi 2e0978d48b Merge "Force test config to be updated when auto_gen_test_config.py is changed" am: a52691b12a
am: a05d8cd880

Change-Id: Ifd6b8d972549ff4e97c031705d09cdc49d55f742
2018-01-02 06:39:16 +00:00
Dan Shi a05d8cd880 Merge "Force test config to be updated when auto_gen_test_config.py is changed"
am: a52691b12a

Change-Id: Ib969a5f9f3cf0ea02843b2265db845b702a8da19
2018-01-02 06:35:56 +00:00
Treehugger Robot a52691b12a Merge "Force test config to be updated when auto_gen_test_config.py is changed" 2018-01-02 06:27:35 +00:00
Dan Shi 2b334f5c92 Force test config to be updated when auto_gen_test_config.py is changed
Bug: 70981774,69929803
Test: Modify tools/auto_gen_test_config.py, confirm the test config file
is updated.

Change-Id: I55bd07c8bdc6e26f9c8ad6df733d2c5da09d0ceb
2018-01-01 20:26:27 -08:00
Colin Cross 96873482b0 Move jacoco before desugar
R8 will replace desugar+proguard+dx, which will mean jacoco has to
run before desugar.  In preparation, move jacoco before desugar now.

Test: m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true SKIP_BOOT_JARS_CHECK=true WITH_DEXPREOPT=false tests
Change-Id: I0627a79ba2f0b26a113d5d8bcc5cb1fda08295a1
2017-12-28 09:39:15 -08:00