Commit Graph

40972 Commits

Author SHA1 Message Date
Treehugger Robot c6b28799e9 Merge "Create artifacts to include the list of test configs" 2017-12-08 00:43:20 +00:00
Treehugger Robot 68a6b90f6b Merge "Get off my lawn forever!" 2017-12-07 23:33:40 +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
Treehugger Robot 3af39153a8 Merge "Create an artifact to include the list of integrated tests in TradeFed" 2017-12-07 22:07:43 +00:00
Elliott Hughes 7a6ef87cbe Get off my lawn forever!
Let folks opt in if they want the custom title.

Bug: https://issuetracker.google.com/38402256
Test: hitting enter no longer flashes this title
Change-Id: I8c1e1b22cc47ab9496797328fb1b13c0827840b0
2017-12-07 13:51:23 -08:00
Treehugger Robot 9a33b96103 Merge "Explain why BuildImage failed." 2017-12-07 21:45:59 +00:00
Isaac Chen d9fed02138 Enable VNDK for aosp_x86 and aosp_x86_64
When VNDK version is not enabled, libminijail.so are built under
system directory. It is not found in GSI, though.

Enable VNDK version causes it to be built under vendor directory.

Bug: 69395141
Test: Both of the following 2 products can boot to home screen.
    $ lunch aosp_x86-userdebug; m -j; emulator
    $ lunch aosp_x86_64-userdebug; m -j; emulator

Change-Id: I6356ffe4a806b3d8fc79057bf772d139209a5f11
Merged-In: I6356ffe4a806b3d8fc79057bf772d139209a5f11
(cherry picked from commit 532d5adf7b)
2017-12-07 15:03:25 +08: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 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
Treehugger Robot fedcf41cc3 Merge "Add java modules to soong_to_convert.txt" 2017-12-07 01:04:27 +00: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
Tao Bao 337633f2b9 releasetools: Remove '-w' from ota_from_target_files options.
'-w' is a short option for '--wipe_user_data', which happens to be the
same as the whole-file signing flag for signapk.

This CL removes the short version to make it less error-prone. Users
should use '--wipe_user_data' to generate packages with enforced data
wipe.

Bug: 70259309
Test: ota_from_target_files.py generates packages with and without
      '--wipe_user_data'.
Test: Not seeing active users that uses 'ota_from_target_files -w'.
Change-Id: Ib8c138663a87aafc6a0b5b6f7c286fb74ef6134b
2017-12-06 15:47:03 -08: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
Xin Li 6bbcc2cbd4 DO NOT MERGE: Merge Oreo MR1 into master
Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: Idcd6eeddfdeec156f0e19e617129561c33d32fdc
2017-12-06 14:24:42 -08:00
Treehugger Robot 7b2129f101 Merge "AVB: If building recovery.img, add AVB hash footer." 2017-12-06 22:12:25 +00:00
Jeff Gaston 5313503663 Merge "Enable SKIP_BOOT_JARS_CHECK by default when instrumenting" 2017-12-06 21:28:28 +00:00
Elliott Hughes 73ff57f48a Explain why BuildImage failed.
BuildImage can return false for lots of reasons. Log two of the more
plausible ones. You'll still need to edit this file and pass True to
RunCommand to work out *what* went wrong, but at least this logging will
tell you *where* things went wrong.

Bug: http://b/63142920
Test: debugged my actual problem
Change-Id: If84427058108dcac0a1b5e2216b8bb11eef522ca
2017-12-06 12:16:39 -08: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 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 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 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 ca989663e9 Merge "Remove path prefix within VNDK snapshot zip"
am: 18e945fb6e

Change-Id: I01b1f989c1e056e7aa5ad664d82cbb65658d4eeb
2017-12-06 03:40:36 +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 e262a65a1d Merge "emulator: allows goldfish to disable bootanimation"
am: 303a5f0c2d

Change-Id: I153a54fca751889aac73ffd54fd9197188599596
2017-12-05 22:03:55 +00:00
Tao Bao 9ad68d6e69 Merge "releasetools: Address pylint warnings in add_img_to_target_files.py."
am: 32c6c4a11e

Change-Id: I4e1d8ad1c6982f969b759f26cf1cb59862bd236f
2017-12-05 22:02:40 +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
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
Tao Bao ead6281575 Merge "releasetools: Remove deprecated pylint options."
am: 3694e104b7

Change-Id: I87a9d6b07dc281bacc99e2935f0835958c3d67b5
2017-12-05 18:45:56 +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
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 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