Commit Graph

41538 Commits

Author SHA1 Message Date
Justin Yun 22b52db8eb Merge "BOARD_VNDK_RUNTIME_DISABLE must not be "true" for VNDK snapshot" am: fd3f4570fa
am: 4c4976b2d2

Change-Id: Ibedfef2ce641588e883e7bb1bc81929cc2ba2c5a
2018-01-05 00:55:32 +00:00
Justin Yun 4c4976b2d2 Merge "BOARD_VNDK_RUNTIME_DISABLE must not be "true" for VNDK snapshot"
am: fd3f4570fa

Change-Id: Ida0e970a53a38f0de7c1d07cf3e5b455160d1a97
2018-01-05 00:50:55 +00:00
Treehugger Robot fd3f4570fa Merge "BOARD_VNDK_RUNTIME_DISABLE must not be "true" for VNDK snapshot" 2018-01-05 00:41:47 +00:00
Justin Yun 4dff0c6974 BOARD_VNDK_RUNTIME_DISABLE must not be "true" for VNDK snapshot
When generating VNDK snapshot, BOARD_VNDK_RUNTIME_DISABLE must not be
'true' to have correct ld.config.txt file.

Bug: 71349776
Test: lunch aosp_arm64_ab-user; make -j vndk dist
Change-Id: I20b14addb2f4a191134a1a9943e328566ca48424
2018-01-05 09:40:47 +09:00
Dan Albert dd65db6483 Merge "Restrict NDK link type to matching STLs." am: 167fcc5cc0
am: e3f8cac48a

Change-Id: I0a86af3d1a9cbf1ea49e0658f23a8017aa9bce36
2018-01-04 23:57:22 +00:00
Dan Albert e3f8cac48a Merge "Restrict NDK link type to matching STLs."
am: 167fcc5cc0

Change-Id: I18b962052c4e07788f24df718da08fe28da2bc82
2018-01-04 23:52:39 +00:00
Treehugger Robot 167fcc5cc0 Merge "Restrict NDK link type to matching STLs." 2018-01-04 23:42:25 +00:00
Tao Bao 74713e35fe Merge "releasetools: Clean up build_image.py." am: 7c53288810
am: 7c8c39179a

Change-Id: Ie760c6387ac9546edc8dc301ab664ecab96db58e
2018-01-04 22:30:06 +00:00
Tao Bao 7c8c39179a Merge "releasetools: Clean up build_image.py."
am: 7c53288810

Change-Id: I9cd881e26cacb6d866d5e405ebceaa173ee19b17
2018-01-04 22:25:50 +00:00
Treehugger Robot 7c53288810 Merge "releasetools: Clean up build_image.py." 2018-01-04 22:20:27 +00:00
Dan Albert 975e303ad2 Restrict NDK link type to matching STLs.
Test: make native
Bug: None
Change-Id: Ie9d9107fe0eeb425843ae2db197e1c60d14a59ca
2018-01-04 12:51:34 -08:00
Jae Shin bd0483aa1c Merge "Apply change in prebuilt names for config files" am: b0f4677748
am: 67eabefbdb

Change-Id: I9027a54b8e36386c26ec5a088524a91d2e6a989b
2018-01-04 20:26:37 +00:00
Jae Shin 67eabefbdb Merge "Apply change in prebuilt names for config files"
am: b0f4677748

Change-Id: I8a4ee1d68019b02e910690ab019b4315b8488609
2018-01-04 20:22:32 +00:00
Treehugger Robot b0f4677748 Merge "Apply change in prebuilt names for config files" 2018-01-04 20:16:36 +00:00
Chih-hung Hsieh b9723e711f Merge "Call clang-tidy with -fno-caret-diagnostics by default." am: bd69b7daa7
am: fd6ce3e672

Change-Id: I05de621349dc6a7935e3c7a5a6eb34919358872f
2018-01-04 19:17:18 +00:00
Chih-hung Hsieh fd6ce3e672 Merge "Call clang-tidy with -fno-caret-diagnostics by default."
am: bd69b7daa7

Change-Id: I6b364d4b7daf1223d1dad12517ff786f9b9f9af7
2018-01-04 19:13:45 +00:00
Chih-hung Hsieh bd69b7daa7 Merge "Call clang-tidy with -fno-caret-diagnostics by default." 2018-01-04 19:07:15 +00:00
Tao Bao 000c76c68b Merge "releasetools: Move assertions into CheckHeadroom()." am: b050f66e42
am: 780be982a7

Change-Id: I0848092782d30436885b3da3716e302e583da503
2018-01-04 18:47:17 +00:00
Tao Bao 780be982a7 Merge "releasetools: Move assertions into CheckHeadroom()."
am: b050f66e42

Change-Id: I7cd54fc34f4b8cfed5cf46e90c435f402bf5cdbb
2018-01-04 18:44:17 +00:00
Treehugger Robot b050f66e42 Merge "releasetools: Move assertions into CheckHeadroom()." 2018-01-04 18:34:24 +00:00
Jiyong Park e45c62ecac Merge "Don't install unnecessary VNDK libs" am: 9e8b5892e4
am: 9c95b363cd

Change-Id: I6d4e96f5ef067d3928a3f3a943f055096ea52aa0
2018-01-04 16:27:02 +00:00
Jiyong Park 9c95b363cd Merge "Don't install unnecessary VNDK libs"
am: 9e8b5892e4

Change-Id: I01ff6a5faca7355083b563b835b71d366663f9b4
2018-01-04 16:22:57 +00:00
Treehugger Robot 9e8b5892e4 Merge "Don't install unnecessary VNDK libs" 2018-01-04 16:14:52 +00:00
Dan Willemsen f6cb311464 Merge "Mark ANDROID_BUILD_TOP as obsolete" am: ce5e4e251e
am: bab4d88cb1

Change-Id: Ic313b6f29a1d162c84f6560d2e41f80411ca2f2d
2018-01-04 13:46:11 +00:00
Dan Willemsen bab4d88cb1 Merge "Mark ANDROID_BUILD_TOP as obsolete"
am: ce5e4e251e

Change-Id: I0edc65987164731c95817ca24749a6346c40d848
2018-01-04 13:43:07 +00:00
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 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 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 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