Commit graph

39699 commits

Author SHA1 Message Date
Jeff Gaston
5313503663 Merge "Enable SKIP_BOOT_JARS_CHECK by default when instrumenting" 2017-12-06 21:28:28 +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
d4760b3eed Merge "Build with OpenJDK 9 -target 1.8 by default except for errorprone." 2017-12-06 11:05:31 +00:00
Treehugger Robot
291768ef7f Merge "Renames sepolicy files from nonplat_* to vendor_*" 2017-12-06 10:00:46 +00:00
Treehugger Robot
30c0278ae1 Merge "Don't embed vendor libs into vendor apks." 2017-12-06 04:14:43 +00:00
Treehugger Robot
18e945fb6e Merge "Remove path prefix within VNDK snapshot zip" 2017-12-06 02:25:49 +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
Bo Hu
303a5f0c2d Merge "emulator: allows goldfish to disable bootanimation" 2017-12-05 19:38:46 +00:00
Tao Bao
32c6c4a11e Merge "releasetools: Address pylint warnings in add_img_to_target_files.py." 2017-12-05 19:13:04 +00:00
Tao Bao
3694e104b7 Merge "releasetools: Remove deprecated pylint options." 2017-12-05 18:27:17 +00:00
bohu
7b46d578e7 emulator: allows goldfish to disable bootanimation
[    2.447332] type=1400 audit(1512424670.440:8): avc: denied { write } for pid=1408 comm="setprop" name="property_service" dev="tmpfs" ino=1216 scontext=u:r:goldfish_setup:s0 tcontext=u:object_r:property_socket:s0 tclass=sock_file permissive=0
[    2.455350] init: Created socket '/dev/socket/adbd', mode 660, user 1000, group 1000
console:/ $ [    2.470594] init: Service 'ranchu-setup' (pid 1387) killed by signal 1

BUG: 70176291

Change-Id: I309ff3cb89ec01673e84fb275fe795f95711edd6
2017-12-05 09:10:16 -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
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
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
Treehugger Robot
79a55b3108 Merge "Revert "Include Treble metadata on Treble enabled devices"" 2017-12-05 00:32:57 +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
Tao Bao
6b9fef5243 releasetools: Address pylint warnings in add_img_to_target_files.py.
C:661, 0: Wrong hanging indentation (add 2 spaces).
        OPTIONS.input_tmp, "VENDOR_IMAGES")
        ^ | (bad-continuation)
C:673, 0: Wrong continued indentation (add 14 spaces).
                os.path.join("IMAGES", img_name))
                ^             | (bad-continuation)
C: 54, 0: Import "import datetime" should be placed at the top of the module (wrong-import-position)
C: 55, 0: Import "import hashlib" should be placed at the top of the module (wrong-import-position)
C: 56, 0: Import "import os" should be placed at the top of the module (wrong-import-position)
C: 57, 0: Import "import shlex" should be placed at the top of the module (wrong-import-position)
C: 58, 0: Import "import shutil" should be placed at the top of the module (wrong-import-position)
C: 59, 0: Import "import subprocess" should be placed at the top of the module (wrong-import-position)
C: 60, 0: Import "import tempfile" should be placed at the top of the module (wrong-import-position)
C: 61, 0: Import "import uuid" should be placed at the top of the module (wrong-import-position)
C: 62, 0: Import "import zipfile" should be placed at the top of the module (wrong-import-position)
C: 64, 0: Import "import build_image" should be placed at the top of the module (wrong-import-position)
C: 65, 0: Import "import common" should be placed at the top of the module (wrong-import-position)
C: 66, 0: Import "import rangelib" should be placed at the top of the module (wrong-import-position)
C: 67, 0: Import "import sparse_img" should be placed at the top of the module (wrong-import-position)
W:391,12: Redefining built-in 'dir' (redefined-builtin)

After this CL, it still gives the warning below, which is to be
addressed with follow-ups.

R:635, 2: Too many nested blocks (6/5) (too-many-nested-blocks)

Test: `m dist`
Test: pylint --rcfile=pylintrc add_img_to_target_files.py
Change-Id: I64da184b6b69e93449dbfc989a5d7f46d5223f42
2017-12-04 12:15:35 -08:00
Tao Bao
dac0c88d9d releasetools: Remove deprecated pylint options.
This option u'required-attributes' will be removed in Pylint 2.0
This option u'ignore-iface-methods' will be removed in Pylint 2.0

Test: pylint (1.6.5) no longer gives above warnings.
Change-Id: Ib07cd5aef87407260140c1fca0b11c439cbdf390
2017-12-04 12:15:23 -08: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
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
cd127ac860 Merge "Add support for RRO in soong app prebuilts" 2017-12-01 22:05:42 +00:00
Bo Hu
fb46f47085 Merge "emulator: api 26 fix guest rendering (build)" 2017-12-01 20:21:53 +00:00
Treehugger Robot
4dd8610e26 Merge "Remove the redundant/wrong write of 'recovery_as_boot='." 2017-12-01 19:26:08 +00:00
Lingfeng Yang
8bed4d0ce6 emulator: api 26 fix guest rendering (build)
As swiftshader is open sourced, put it into emulator
targets to enable -gpu guest option.

Test: build aosp_x86-eng, launch emulator -gpu guest
and it should boot to home screen.

Change-Id: I2140d7cec28d5f00b7463b1d37d9cf62120398fb
Merged-In: I2140d7cec28d5f00b7463b1d37d9cf62120398fb
2017-12-01 08:57:53 -08: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
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
Treehugger Robot
44e363f1e3 Merge "emulator: support system-as-root" 2017-11-30 20:07:58 +00:00
Jae Shin
2e42c54028 Merge "Include config files to VNDK snapshot" 2017-11-30 11:04:19 +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
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
Treehugger Robot
b8d6ac2150 Merge "Copy soong java prebuilts to classes-pre-proguard.jar" 2017-11-30 06:27:21 +00:00
bohu
e9046cbbaa emulator: support system-as-root
BUG: 69770927

Test: build sdk_gphone_x86-userdebug, boot up
to home with Tot emulator

Test: build sdk_phone_armv7-userdebug, boot up
to home with Tot emulator

Change-Id: I39348bf35cb748c08ed68a048389bbfc2279a91c
Merged-In: I39348bf35cb748c08ed68a048389bbfc2279a91c
2017-11-29 22:08:28 -08: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
Dan Willemsen
25c73e9156 Fix / suppress warnings for clang+mingw
Switch attribute error to attribute unavailable, which apparently works
since it then broke the build :-/

Suppress unused parameter warnings. They aren't that useful for windows
functions that are just #ifndef WIN32. This is marked as a global cflag,
but something is overriding that with the clang+mingw changes, and it's
not actually that hard to suppress or fix where necessary.

Bug: 69933068
Test: mmma build/tools/libhost
Change-Id: I09adda4544bc9b56452b4fe182dba3d0b701dcbb
2017-11-29 20:54:33 -08: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
f170166521 Merge "Switch unused deprecated variables to obsolete" 2017-11-30 01:49:11 +00:00
Treehugger Robot
9ddf8ea3a5 Merge "Export PRODUCT_SOONG_NAMESPACES to Soong" 2017-11-29 23:54:29 +00:00
Tianjie Xu
cca4a4c993 Merge "Improve the comment in AddSplitTransfers" 2017-11-29 21:48:55 +00:00