Commit Graph

42324 Commits

Author SHA1 Message Date
Jae Shin df0ca38484 Merge changes Ida449978,I8c6953f1 am: 8b759c08ca am: 6d5a2d54ff
am: 1e9b97e595

Change-Id: Ia3a7e7cd5319321bc97f482e9f0d0e2ad887666e
2018-01-05 01:36:44 +00:00
Jae Shin 1e9b97e595 Merge changes Ida449978,I8c6953f1 am: 8b759c08ca
am: 6d5a2d54ff

Change-Id: Ic7606d7572e7143324a210d56ce641f038d6b815
2018-01-05 01:31:12 +00:00
Jae Shin 6d5a2d54ff Merge changes Ida449978,I8c6953f1
am: 8b759c08ca

Change-Id: Ib373611cdff8753a13f8b8c301bdfac2381b8168
2018-01-05 01:26:41 +00:00
Jae Shin 8b759c08ca Merge changes Ida449978,I8c6953f1
* changes:
  Apply snapshot variant to vndk package module name
  Additionally package TARGET_2ND_ARCH variants
2018-01-05 01:16:06 +00:00
Justin Yun 825cd12add Merge "BOARD_VNDK_RUNTIME_DISABLE must not be "true" for VNDK snapshot" am: fd3f4570fa am: 4c4976b2d2
am: 22b52db8eb

Change-Id: I6b4387271135f78aca240b3a1d677efc602859b3
2018-01-05 01:06:09 +00:00
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 4d0f1e3848 Merge "Restrict NDK link type to matching STLs." am: 167fcc5cc0 am: e3f8cac48a
am: dd65db6483

Change-Id: I8ae93f61e457d8360f7457a7c900420d6a51bcb3
2018-01-05 00:04:52 +00: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 055dcc96f9 Merge "releasetools: Clean up build_image.py." am: 7c53288810 am: 7c8c39179a
am: 74713e35fe

Change-Id: I37753878ad7fe9994f4dfc3e0a1124d6ae751f7f
2018-01-04 22:35:02 +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 7b02f90ab7 Merge "Apply change in prebuilt names for config files" am: b0f4677748 am: 67eabefbdb
am: bd0483aa1c

Change-Id: I51c348d36a4597251409962d5b2801478c558a06
2018-01-04 20:30:41 +00: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 000242eaf8 Merge "Call clang-tidy with -fno-caret-diagnostics by default." am: bd69b7daa7 am: fd6ce3e672
am: b9723e711f

Change-Id: Ic0936747d1078c72ec34e540eb6d94c1440e6797
2018-01-04 19:21:25 +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 550012ea79 Merge "releasetools: Move assertions into CheckHeadroom()." am: b050f66e42 am: 780be982a7
am: 000c76c68b

Change-Id: Idb98698d18da2797c862c5d1992cbb5044705287
2018-01-04 18:51:22 +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 df4c54f894 Merge "Don't install unnecessary VNDK libs" am: 9e8b5892e4 am: 9c95b363cd
am: e45c62ecac

Change-Id: I6e1033e6956ad0c799ea4528e854084558576fcc
2018-01-04 16:30:34 +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 1114f0c88c Merge "Mark ANDROID_BUILD_TOP as obsolete" am: ce5e4e251e am: bab4d88cb1
am: f6cb311464

Change-Id: Ie4506e1b9525df8ee32eb7c9f24404ec7292968d
2018-01-04 13:49:46 +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 3e5d71ad7d Merge "Build with OpenJDK 9 -target 1.8 by default (attempt 4)." am: 1644e2f1b7 am: a902b41648
am: d7b2ec09d9  -s ours

Change-Id: Iae91c13ccf20980a2e0af20a20b112935c7fea43
2018-01-04 11:32:32 +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 c5a8c2ac83 Merge changes from topic "soong_r8" am: 8798bb70da am: c9f5afb07e
am: 08cf35feb9

Change-Id: I73a70ec6303b7210947e832ec3f767d33fa6bba2
2018-01-04 00:27:19 +00: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