Commit Graph

41952 Commits

Author SHA1 Message Date
Treehugger Robot f9d8f6fa7d Merge "Fix multilib test data being installed twice to the same place" 2018-01-27 03:42:09 +00:00
Dan Willemsen 4133793ce3 Fix multilib test data being installed twice to the same place
Fixes lots of warnings of the form:

build/make/core/base_rules.mk:606: warning: overriding commands for target `out/target/product/generic_arm64/testcases/simpleperf_unit_test/testdata/perf.data'
build/make/core/base_rules.mk:606: warning: ignoring old commands for target `out/target/product/generic_arm64/testcases/simpleperf_unit_test/testdata/perf.data'

Test: lunch aosp_arm64-eng; m device-tests
Change-Id: I32575d25f3aef1d4000fcb63d6ffc025ad21f937
2018-01-26 16:57:57 -08:00
Alex Light 393453d761 Merge "Revert "Apply hiddenapi build tool on boot jars"" am: 9f1e629503
am: 67bf2d712a

Change-Id: I93d9c9d577caa8c3a2d0645c5a3a6367a702d75e
2018-01-26 19:40:51 +00:00
David Brazdil 7a0c5eeb20 Merge "Move locations of all hidden API lists into the build folder" am: 661f97b62b
am: c573a77645

Change-Id: Ifc749b190c388b076ceadd872fd80b1891be4dd2
2018-01-26 19:35:26 +00:00
Alex Light 67bf2d712a Merge "Revert "Apply hiddenapi build tool on boot jars""
am: 9f1e629503

Change-Id: Ic5def7e5a00c04da6dab1779b0414c7347589188
2018-01-26 19:29:09 +00:00
David Brazdil c573a77645 Merge "Move locations of all hidden API lists into the build folder"
am: 661f97b62b

Change-Id: Ia5397c9feddac2633886fb57c2525069913a2f94
2018-01-26 19:16:35 +00:00
Alex Light 9f1e629503 Merge "Revert "Apply hiddenapi build tool on boot jars"" 2018-01-26 18:40:55 +00:00
Alex Light 4a2926a44e Revert "Apply hiddenapi build tool on boot jars"
This reverts commit b7f00ed2af.

Bug: 72550707
Bug: 64382372
Test: atest CtsInlineMockingTestCases

Reason for revert: Causing invalid dex files to be passed to jvmti
                   agents. This causes CtsInlineMockingTestCases and
                   other tests to fail.

Change-Id: I50129e94791b9e2bef919fe398b4250ae461195b
2018-01-26 18:16:52 +00:00
David Brazdil 661f97b62b Merge "Move locations of all hidden API lists into the build folder" 2018-01-26 16:03:25 +00:00
David Brazdil 41847e1917 Add flag to control hidden API warning toasts
Just like visual warnings about improper use of native libraries,
warnings about the usage of hidden APIs will be displayed in non-
final, non-user builds only.

Bug: 64382372
Test: make
Change-Id: Id0a4200f912ac3303026cb26b6d8974c47332828
2018-01-26 12:19:32 +00:00
David Brazdil 2e36f52738 Move locations of all hidden API lists into the build folder
ART buildbots are broken because they build against a pinned commit of
the framework and thus lack the build rules to generate hidden API lists
We aim to fix this by generating dummy API lists in the build folder.
This patch changes the location of the blacklist and dark greylist from
frameworks/base/config/ to ${TARGET_COMMON_OUT_INTERMEDIATES}/... . On
normal builds, the framework will copy its text files into the build
folder.

Test: make
Bug: 64382372
Change-Id: I9b55d2865599e367d9c4be4f834182f5c084c3bf
2018-01-26 11:35:36 +00:00
Tobias Thierer 0276db1ec7 javac 9 -target 1.9: Move bootclasspath jars onto classpath.
When building with OpenJDK 9's javac with -source 1.9 -target 1.9,
a runtime image (with system modules) is used via the --system
command line flag, instead of --bootclasspath.
The runtime image only contains the default libraries (libcore)
but is missing other libraries that might be on the bootclasspath
for a particular build target.

This CL fixes compilation for this case by adding the missing
jars onto the classpath instead.

This already used to work but was broken by CL [1]. I attempted
to conditionally revert some of that CL's changes to java_common.mk
for the case of language level 1.9, but couldn't get it to work.
Therefore this CL follows a different approach.

[1] http://r.android.com/519552

Bug: 38177569
Test: Treehugger
Test: Ran "EXPERIMENTAL_USE_OPENJDK9=true make checkbuild docs"
      and spot-checked some javac invocations to confirm that the
      system modules libs were not included in the bootclasspath,
      but other libs were.

Change-Id: I48fd11aac9b310bfa58dee0f9cfb3ef33f10bca8
2018-01-26 02:48:48 +00:00
Bryan Eyler bee8b0b15c Merge "Fix comment indicator on endif" am: 9f1b1f90a1
am: 7557f2bc67

Change-Id: I78a8145c76c0f0f9faa6a744a364727c9e7d5554
2018-01-26 02:15:53 +00:00
Bryan Eyler 7557f2bc67 Merge "Fix comment indicator on endif"
am: 9f1b1f90a1

Change-Id: I9cf4196a5c2b35aca565fee3f91c6ff11a517952
2018-01-26 02:12:56 +00:00
Treehugger Robot 9f1b1f90a1 Merge "Fix comment indicator on endif" 2018-01-26 01:21:26 +00:00
Bryan Eyler 57b5232def Fix comment indicator on endif
It's referring to the wrong if start.

Change-Id: I6f78aee54fb89fb5f69a4e86102d5a8e2cc2bbd1
2018-01-25 14:55:31 -08:00
Steven Moreland e08d290862 Merge "Fix INSTALLED_ -> BUILT_ missing refactor piece." am: 98fce11494
am: a7f62c3864

Change-Id: Ib6c7a336a01e33b217fdf278192fb689ff5ef424
2018-01-25 22:24:11 +00:00
David Brazdil 74f173806b Merge "Apply hiddenapi build tool on boot jars" am: 221848b181
am: b1831cf27e

Change-Id: Ia376d5d6f42fdf71eaa2f18e38be0ac3baef45b6
2018-01-25 22:23:34 +00:00
Steven Moreland a7f62c3864 Merge "Fix INSTALLED_ -> BUILT_ missing refactor piece."
am: 98fce11494

Change-Id: I17c1cc8379022aa1068036318b8b9e790226be16
2018-01-25 22:16:31 +00:00
David Brazdil b1831cf27e Merge "Apply hiddenapi build tool on boot jars"
am: 221848b181

Change-Id: I79e824d64d23bdb39b129cf439f9e780839b5946
2018-01-25 22:15:49 +00:00
Treehugger Robot 98fce11494 Merge "Fix INSTALLED_ -> BUILT_ missing refactor piece." 2018-01-25 21:23:28 +00:00
Andreas Gampe cf528ca79d Warn.py: Update errorprone categories
From current tip-of-tree.

Bug: 72451126
Test: build/make/tools/warn.py errorprone.log
Change-Id: I1d632fb8801b74af695b4f7f464a99792e46637a
2018-01-25 12:25:20 -08:00
David Brazdil 221848b181 Merge "Apply hiddenapi build tool on boot jars" 2018-01-25 19:51:29 +00:00
Primiano Tucci 2165431165 Merge "Add perfetto daemons and cmdline client to core makefiles" am: 27be3bf0e2
am: 80f1fee17b

Change-Id: I1794ebfe02e867dd35a03f70fce846a6852e78ec
2018-01-25 19:02:03 +00:00
Primiano Tucci 80f1fee17b Merge "Add perfetto daemons and cmdline client to core makefiles"
am: 27be3bf0e2

Change-Id: I68262d0e91647e9723414a96df71f68631575c3f
2018-01-25 18:58:54 +00:00
Steven Moreland 915f35166f Fix INSTALLED_ -> BUILT_ missing refactor piece.
Some of the dependencies for target-files-package were
refactored but only partially. Since these are satisfied
by transitive dependencies, the problem wasn't noticed
earlier.

Bug: N/A
Test: target-files-package finds dependencies

Change-Id: Ibdd7587f87735148e55d3b9835478075b6547efc
2018-01-25 10:45:26 -08:00
Primiano Tucci 27be3bf0e2 Merge "Add perfetto daemons and cmdline client to core makefiles" 2018-01-25 18:38:09 +00:00
Nicolas Geoffray 8f4f0f43a1 Merge "For prebuilts, use the built_module for nostripping dexpreopt." am: f90b7e1948
am: 3a011d4f9c

Change-Id: Id8993df444b6a2faaeaa4c4589b31a8be1b543ba
2018-01-25 15:56:45 +00:00
David Brazdil 185422e1c0 Merge "Add hidden API list file variables" am: a5cc50ab4c
am: f167eac95e

Change-Id: Id90f1b1e1587095903406be207b2e3f23e65d30a
2018-01-25 15:34:08 +00:00
Primiano Tucci 90ebe5baf2 Add perfetto daemons and cmdline client to core makefiles
Perfetto is a tracing daemon that allows both to capture
traces from the kernel (via the traced_probes binary)
and allows data to be pushed from userspace (via the
traced binary). Tracing is never enabled by default
and can be kicked off either via statsd or by the shell.
The daemon executables are split only for the sake
of security and isolating SELinux domains. Under the
hoods they are just two shells that run code in the
same shared libarary.
See go/perfetto-sys-health-details for expected
binary / memory / overhead impact.

Bug: 72484603
Test: builds (see go/perfetto-test-spec for test plan)
Change-Id: Ib5fbd7cd2113010398802b622363b75f3eef738d
2018-01-25 15:32:11 +00:00
Nicolas Geoffray 3a011d4f9c Merge "For prebuilts, use the built_module for nostripping dexpreopt."
am: f90b7e1948

Change-Id: Id975f2ebaf3ce0f7e59544c47dc0a9ed80b0e2bb
2018-01-25 15:17:56 +00:00
David Brazdil f167eac95e Merge "Add hidden API list file variables"
am: a5cc50ab4c

Change-Id: I1f6855936dd9a3ec952f7c43695891216ecd242a
2018-01-25 15:04:45 +00:00
David Brazdil b7f00ed2af Apply hiddenapi build tool on boot jars
Restrictions on usage of private APIs require encoding new information
into the dex files of the boot class path. ART now contains a new build
tool called `hiddenapi` which takes three lists of class member
signatures (blacklist, light and dark greylist), finds the class members
in their respective dex files and modifies their access flags in place.

This patch invokes the `hiddenapi` tool on all JARs in
PRODUCT_BOOT_JARS. For Java libraries built with Makefiles the tool is
invoked after the dexer directly on DEX files. For Soong-built
libraries, the build system has to unzip the JAR produced by Soong,
apply `hiddenapi` and rezip again. This is due to the fact that the
PRODUCT_BOOT_JARS variable is not available to Soong.

Bug: 64382372
Test: m
Change-Id: I6ce897d204459c8b6f46ed49e0909ff76c08a9ed
2018-01-25 09:22:08 +00:00
Nicolas Geoffray f90b7e1948 Merge "For prebuilts, use the built_module for nostripping dexpreopt." 2018-01-25 08:58:48 +00:00
David Brazdil a5cc50ab4c Merge "Add hidden API list file variables" 2018-01-25 07:55:35 +00:00
Jaekyun Seok f430ea5ebf Merge "Support /product partition" am: 8fe7f9bfa2
am: 039e0991d5

Change-Id: I325ae6518c55f1fc310233a5f67ce3df1ae4940f
2018-01-25 04:11:49 +00:00
Jaekyun Seok 039e0991d5 Merge "Support /product partition"
am: 8fe7f9bfa2

Change-Id: I3ee5e565f9855b1b14883355b8a048cd9f67da00
2018-01-25 04:04:19 +00:00
Jaekyun Seok 8fe7f9bfa2 Merge "Support /product partition" 2018-01-25 03:53:37 +00:00
Alexey Polyudov 43202e527a Merge "Fix syntax error in makefile soong namespaces handling" am: 01b873b2de
am: 683fa28a6a

Change-Id: I6ff2416c6c49c83d8f270d83767fe2ce27d8075f
2018-01-25 03:50:00 +00:00
Alexey Polyudov 683fa28a6a Merge "Fix syntax error in makefile soong namespaces handling"
am: 01b873b2de

Change-Id: I89e497c99ecfba460a1466506b46b2a56bae5087
2018-01-25 03:43:03 +00:00
Alexey Polyudov 01b873b2de Merge "Fix syntax error in makefile soong namespaces handling" 2018-01-25 03:33:58 +00:00
Tri Vo a7c4cc4b1d Merge "healthd: fix /sys denials." am: 88114b0b0b
am: 09f34add81

Change-Id: Iee7f7c30ed91ca6ddf126c3ce4dfa2349147349f
2018-01-25 03:02:09 +00:00
Tri Vo 09f34add81 Merge "healthd: fix /sys denials."
am: 88114b0b0b

Change-Id: Ia51a4d5f0daa61e65d37c98f6015203204a3e1dc
2018-01-25 02:51:24 +00:00
Treehugger Robot 88114b0b0b Merge "healthd: fix /sys denials." 2018-01-25 02:01:58 +00:00
Dan Willemsen d61ce6cd37 Merge "Add Nan to OWNERS" am: 11e95dedd2
am: f5e4f21831

Change-Id: Ifb2687e86907540bf2dd9249cae3dabd07ea5ddf
2018-01-25 01:18:22 +00:00
Dan Willemsen f5e4f21831 Merge "Add Nan to OWNERS"
am: 11e95dedd2

Change-Id: Ia897d9acd6857941f4247b08b9c5fcc7e02fba31
2018-01-25 01:09:39 +00:00
Alexey Polyudov ea55e8c86c Fix syntax error in makefile soong namespaces handling
Change-Id: I5254f7877422e23f3c3b69f37f1be849a12e296a
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
2018-01-24 17:01:21 -08:00
Jaekyun Seok b7735d8105 Support /product partition
This CL adds the following build flags to support building product partition
from Android build system.
- BOARD_AVB_PRODUCT_ADD_HASHTREE_FOOTER_ARGS
- BOARD_AVB_PRODUCT_KEY_PATH
- BOARD_AVB_PRODUCT_ALGORITHM
- BOARD_AVB_PRODUCT_ROLLBACK_INDEX_LOCATION
- BOARD_PREBUILT_PRODUCTIMAGE
- BOARD_PRODUCTIMAGE_EXTFS_INODE_COUNT
- BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE
- BOARD_PRODUCTIMAGE_PARTITION_SIZE
- BOARD_PRODUCTIMAGE_SQUASHFS_BLOCK_SIZE
- BOARD_PRODUCTIMAGE_SQUASHFS_COMPRESSOR
- BOARD_PRODUCTIMAGE_SQUASHFS_COMPRESSOR_OPT
- BOARD_PRODUCTIMAGE_SQUASHFS_DISABLE_4K_ALIGN
- BOARD_USES_PRODUCTIMAGE
- LOCAL_PRODUCT_MODULE
- PRODUCT_FOOTER_ARGS
- PRODUCT_PRODUCT_BASE_FS_PATH
- PRODUCT_PRODUCT_VERITY_PARTITION
- TARGET_COPY_OUT_PRODUCT
- TARGET_OUT_PRODUCT*

And PRODUCT_PRODUCT_PROPERTIES is added to save product-specific
properties in /product/build.prop.

Bug: 64195575
Test: succeeded building product.img with BOARD_PRODUCTIMAGE_PARTITION_SIZE,
BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE and PRODUCT_PRODUCT_VERITY_PARTITION.

Change-Id: I774e6a38003734421591e51bed103802ff84f432
2018-01-25 09:33:58 +09:00
Treehugger Robot 11e95dedd2 Merge "Add Nan to OWNERS" 2018-01-25 00:31:49 +00:00
David Brazdil ae6915ead0 Add hidden API list file variables
Add variables for the hidden API blacklist and dark and light greylist
files. These are text files with signatures of boot class path class
member with restricted access for non-platform code.

Bug: 64382372
Test: m
Change-Id: I5639c5269872ac626efc69bd3a374a7a7125d502
2018-01-24 20:48:54 +00:00