Commit Graph

16019 Commits

Author SHA1 Message Date
Bowgo Tsai
e419d370da Merge "Renames sepolicy files from nonplat_* to vendor_*" am: 5e7d417271 am: 897c432036
am: 8f03b86120

Change-Id: I4b38dcd1cc0f85c61c57d113df02fc45a714649d
2018-01-31 14:51:51 +00:00
Bowgo Tsai
8f03b86120 Merge "Renames sepolicy files from nonplat_* to vendor_*" am: 5e7d417271
am: 897c432036

Change-Id: I7f445103859d40551c398b220c41e7ec96b5bd89
2018-01-31 14:49:12 +00:00
Isaac Chen
8d11febd59 Add ro.vendor.product.cpu.* to vendor/build.prop
CPU/ABIs related information is already in system/build.prop. It
should also be included in the vendor image so it can still be
examined outside of a device, build environment, or $OUT directory,
by a standalone utility to check its basic characteristics and if
it's compatible with some specific system image (usually GSI).

Bug: 72079894
Test: Built and verified aosp_x86(_64):
      # On host
      $ grep ro.vendor.product.cpu $OUT/vendor/build.prop
      # On device
      $ getprop | grep ro.vendor.product
      $ su
      # grep ro.vendor.product /vendor/build.prop

Change-Id: Ic9ac8065d5983710840e33a805f982de75d86ce3
2018-01-31 14:27:37 +08:00
David Brazdil
b8fa6dd104 Revert "Revert "Apply hiddenapi build tool on boot jars""
This reverts commit 4a2926a44e.

Reason for revert: The original CL caused two issues:
1) Increased app startup because `profman` failed to verify boot
jars and created an empty profile for the boot image. All methods
in the framework therefore ran interpreted/JITed. New flag
"--skip-apk-verification" has been added to `profman` to fix
the issue in CL Iad614e47feada293218c11cff985a8012ca49a0f.
2) Caused a crash in Mockito CTS tests because jvmti did not
remove hiddenapi access flags from boot jars before using them.
This has been fixed with CL Ibc9a96a6b541c06844f276db009ac29514f7a3bb.

Bug: 64382372
Bug: 72550707
Test: make test-art-host
Change-Id: Ie8c58714455662f042f56b2977b01b75c5ec7d2f
2018-01-30 18:25:46 +00:00
Bowgo Tsai
8b5f514038 Renames sepolicy files from nonplat_* to vendor_*
Bug: 64240127
Test: boot an existing device
Change-Id: I6d6ac7d9dee450b2a20649e5f4dbb8976f48061e
2018-01-30 16:15:12 +08:00
Dan Willemsen
bd2f15cd58 Merge "Clean up some kati warnings" am: 157fbf771b am: 6432cf64b6
am: 6597699c8d

Change-Id: If7fe1940d10ff759c4606c314f98030fad83b232
2018-01-30 07:53:15 +00:00
Dan Willemsen
6597699c8d Merge "Clean up some kati warnings" am: 157fbf771b
am: 6432cf64b6

Change-Id: I49dac5cbfb0dac0c6302775f1e3defeaff8c2dcb
2018-01-30 07:50:37 +00:00
Dan Willemsen
157fbf771b Merge "Clean up some kati warnings" 2018-01-30 07:43:27 +00:00
Pirama Arumuga Nainar
4103f7701e Merge "Write SOONG_MODULES_MISSING_PGO_PROFILE_FILE to $DIST_DIR" am: d33cac8af1 am: 7760fdff02
am: 64e15096e5

Change-Id: I4149b8650a3d1234034355f88a38f97e41a0abba
2018-01-30 06:48:03 +00:00
Pirama Arumuga Nainar
64e15096e5 Merge "Write SOONG_MODULES_MISSING_PGO_PROFILE_FILE to $DIST_DIR" am: d33cac8af1
am: 7760fdff02

Change-Id: I1369ae7e4518d2ed86fee465a4276f20a412eabf
2018-01-30 06:45:58 +00:00
Treehugger Robot
d33cac8af1 Merge "Write SOONG_MODULES_MISSING_PGO_PROFILE_FILE to $DIST_DIR" 2018-01-30 06:34:15 +00:00
Dan Willemsen
893bebc44b Clean up some kati warnings
Kati has a `--warn` option that adds some extra Kati-specific warnings
-- like using undefined make functions, undefined user functions, likely
bad variable lookups, etc. Some of these are bugs, others are fine doing
nothing. This fixes up all of them in the core build system.

It also complains about $(eval) usage in a recipe not being recommended.
Those aren't handled as part of this change.

Bug: 72661763
Test: build-aosp_arm.ninja is identical before and after
Change-Id: I8e00af142a7745236d3ad4efc9e91ec3ce71a511
2018-01-29 16:23:37 -08:00
Pirama Arumuga Nainar
ae9595674b Write SOONG_MODULES_MISSING_PGO_PROFILE_FILE to $DIST_DIR
Bug: http://b/72642679

Store missing profile files and the modules that refer to them, passed
via SOONG_MODULES_MISSING_PGO_PROFILE_FILE variable, to
$DIST_DIR/pgo_profile_file_missing.txt as part of the 'dist' target.

Test: 'm dist' and verify creation of pgo_profile_file_missing.txt.
Change-Id: I4ac0a1f413cbb99b33ad1903aeebd3ebcf3b9f59
2018-01-29 14:48:08 -08:00
Tobias Thierer
ebbbb5b1a2 Merge "javac 9 -target 1.9: Move bootclasspath jars onto classpath." am: e1b94da7c8 am: 6f1cb62ed4
am: 57e6177293

Change-Id: I588c93bfaa3f39405118452d4aa401f84f28c3e4
2018-01-29 11:01:12 +00:00
Tobias Thierer
57e6177293 Merge "javac 9 -target 1.9: Move bootclasspath jars onto classpath." am: e1b94da7c8
am: 6f1cb62ed4

Change-Id: If14a89546419322204e702d1c6f917310223e40e
2018-01-29 10:58:06 +00:00
Tobias Thierer
e1b94da7c8 Merge "javac 9 -target 1.9: Move bootclasspath jars onto classpath." 2018-01-29 10:51:24 +00:00
David Brazdil
ad8aafc390 Merge "Add flag to control hidden API warning toasts" am: 4e6c5218db am: 744c286b07
am: ebbd39f4fd

Change-Id: If83b5b32ac6d24baf389d7b68ce63c876b1ef931
2018-01-29 10:33:15 +00:00
David Brazdil
ebbd39f4fd Merge "Add flag to control hidden API warning toasts" am: 4e6c5218db
am: 744c286b07

Change-Id: Ib0734cf6c5a127c2f2c55fd381b10631839a7229
2018-01-29 10:30:33 +00:00
David Brazdil
4e6c5218db Merge "Add flag to control hidden API warning toasts" 2018-01-29 10:22:10 +00:00
Dan Willemsen
2f60353cc5 Merge "Fix multilib test data being installed twice to the same place" am: f9d8f6fa7d am: 71bea86caa
am: 076ace4727

Change-Id: I012765f5d0076733428aacb051cc37175ea04fd2
2018-01-27 03:55:30 +00:00
Dan Willemsen
076ace4727 Merge "Fix multilib test data being installed twice to the same place" am: f9d8f6fa7d
am: 71bea86caa

Change-Id: Ie5a1f0de006fdc37d7c2abe6e2f083cbc2d1a905
2018-01-27 03:52:15 +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
e66c468790 Merge "Revert "Apply hiddenapi build tool on boot jars"" am: 9f1e629503 am: 67bf2d712a
am: 393453d761

Change-Id: I4e69247e2add400d6dad997cca04b1969384bb4f
2018-01-26 19:54:13 +00:00
David Brazdil
0925496f17 Merge "Move locations of all hidden API lists into the build folder" am: 661f97b62b am: c573a77645
am: 7a0c5eeb20

Change-Id: I0218a071fe789454a11ce985fd24bae5e528ae4e
2018-01-26 19:46:16 +00: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
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
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
63c7963127 Merge "Fix comment indicator on endif" am: 9f1b1f90a1 am: 7557f2bc67
am: bee8b0b15c

Change-Id: Ibf7f68074e5c2b1839c7171a822fdfe7a68f4e85
2018-01-26 02:23:45 +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
Treehugger Robot
9f1b1f90a1 Merge "Fix comment indicator on endif" 2018-01-26 01:21:26 +00:00
Steven Moreland
15f6a241ca Merge "Fix INSTALLED_ -> BUILT_ missing refactor piece." am: 98fce11494 am: a7f62c3864
am: e08d290862

Change-Id: I7818b32a508854e7815c484e8bd0284cd94733f0
2018-01-26 00:17:16 +00:00
David Brazdil
5f97aef277 Merge "Apply hiddenapi build tool on boot jars" am: 221848b181 am: b1831cf27e
am: 74f173806b

Change-Id: I60a5482f2a04429e3dcbf47ed82441cb3c702cdc
2018-01-26 00:16:38 +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
Treehugger Robot
98fce11494 Merge "Fix INSTALLED_ -> BUILT_ missing refactor piece." 2018-01-25 21:23:28 +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
Elisa Pascual Trevino
eeb4dba38a Update Security String to 2018-03-05 for master
Bug:72469949
2018-01-25 17:22:55 +00:00
Nicolas Geoffray
957e09a7b9 Merge "For prebuilts, use the built_module for nostripping dexpreopt." am: f90b7e1948 am: 3a011d4f9c
am: 8f4f0f43a1

Change-Id: I99b80d7d33a5a79b3c345a908b9937a11e00c89b
2018-01-25 16:20:44 +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
d9db756f3c Merge "Add hidden API list file variables" am: a5cc50ab4c am: f167eac95e
am: 185422e1c0

Change-Id: I62a495fa5fd380ab5aac341c322af87fb52cd05b
2018-01-25 15:47:31 +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
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
Przemyslaw Szczepaniak
c77f86db44 Merge "Enforce deprecation policy for apps." 2018-01-25 09:20:18 +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