Commit Graph

43543 Commits

Author SHA1 Message Date
Paul Duffin
d45daf6191 Merge "Conditionally remove atb from bootclasspath" 2018-01-30 11:20:50 +00:00
SzuWei Lin
6e96487968 Correct some GSI settings to board makefile
TARGET_SUPPORTS_32_BIT_APPS and TARGET_SUPPORTS_64_BIT_APPS should
be board config variables. Move them to
target/board/treble_common_64.mk

Bug: 70951849
Test: lunch aosp_arm64_ab-userdebug; make -j
Change-Id: Ia3f6d5db1a7edc956597ab34c2feed088ecc6062
2018-01-30 17:23:47 +08: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
6432cf64b6 Merge "Clean up some kati warnings"
am: 157fbf771b

Change-Id: Ib3a38e2b544900f6961c9af9d71ff1762c4fb02a
2018-01-30 07:48:08 +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
Pirama Arumuga Nainar
7760fdff02 Merge "Write SOONG_MODULES_MISSING_PGO_PROFILE_FILE to $DIST_DIR"
am: d33cac8af1

Change-Id: I059548084c60592998518986c9c09e3eab145965
2018-01-30 06:40:56 +00:00
Treehugger Robot
d33cac8af1 Merge "Write SOONG_MODULES_MISSING_PGO_PROFILE_FILE to $DIST_DIR" 2018-01-30 06:34:15 +00:00
Andreas Gampe
a9e3f4f36c Merge "Warn.py: Update errorprone categories" am: 709ee786cd am: 2192dda42a
am: 7417ece30a

Change-Id: I1f62020caa042fa00533e13da14c69dd1aeecccf
2018-01-30 02:16:04 +00:00
Andreas Gampe
7417ece30a Merge "Warn.py: Update errorprone categories" am: 709ee786cd
am: 2192dda42a

Change-Id: If813b0e077ecf356ac82ece41a9eef2bde6ab242
2018-01-30 02:13:56 +00:00
Andreas Gampe
2192dda42a Merge "Warn.py: Update errorprone categories"
am: 709ee786cd

Change-Id: I6fb3ff3712f841d67b58af90931c3d735ed5746a
2018-01-30 02:11:51 +00:00
Treehugger Robot
709ee786cd Merge "Warn.py: Update errorprone categories" 2018-01-30 02:05:19 +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
Tri Vo
b97219cf3e Merge "Fix /sys denials." am: d8e3c4eb07 am: 55bb62895e
am: abdf6ef257

Change-Id: I54779227cbea868c6577b9df409fff7315562100
2018-01-29 22:22:58 +00:00
Tri Vo
abdf6ef257 Merge "Fix /sys denials." am: d8e3c4eb07
am: 55bb62895e

Change-Id: I6507cb7c04af3e61984ea57dea553f13386403cb
2018-01-29 22:15:38 +00:00
Tri Vo
55bb62895e Merge "Fix /sys denials."
am: d8e3c4eb07

Change-Id: Icef6458b50ef11744bdcfd19ed22b678d06f45b3
2018-01-29 22:12:17 +00:00
Treehugger Robot
d8e3c4eb07 Merge "Fix /sys denials." 2018-01-29 22:04:32 +00:00
Tianjie Xu
6b3a9f8a40 Merge "Double check the sha1 for ranges during package generation" am: 92d73d3ab9 am: e62b278865
am: 65ac13cf08

Change-Id: I9aff2f5580681386cc63eadf8b567bd986d195e0
2018-01-29 20:03:43 +00:00
Tianjie Xu
65ac13cf08 Merge "Double check the sha1 for ranges during package generation" am: 92d73d3ab9
am: e62b278865

Change-Id: Icc1145a71430470ee9ef44043cd4b3532207bed9
2018-01-29 20:00:05 +00:00
Tianjie Xu
e62b278865 Merge "Double check the sha1 for ranges during package generation"
am: 92d73d3ab9

Change-Id: Ieb23111a1e42240c5a9754a3ee4dd50ec055f823
2018-01-29 19:57:29 +00:00
Tianjie Xu
df1166e92f Protect SparseImage._GetRangeData() with lock
The generator function is not thread safe and is prone to race
conditions. This CL uses a lock to protect this generator and loose the
locks elsewhere, e.g. 'WriteRangeDataToFd()'.

Bug: 71908713
Test: Generate an incremental package several times for angler 4208095 to 4442250.
Change-Id: I9e6f0a182a1ba7904a597f403f2b12fe05016513
2018-01-29 11:52:10 -08:00
Tianjie Xu
92d73d3ab9 Merge "Double check the sha1 for ranges during package generation" 2018-01-29 19:50:08 +00:00
Paul Duffin
e2819d8456 Conditionally remove atb from bootclasspath
If REMOVE_ATB_FROM_BCP=true then this adds the
framework-atb-backward-compatibility library to the bootclasspath.

Otherwise, it adds the android.test.base library instead.

Bug: 30188076
Test: build, flash and test manually and with FrameworkCoreTests
Change-Id: I3c15c35724426a9cdeef398c5bc4f5176a8fc752
2018-01-29 11:48:42 +00: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
6f1cb62ed4 Merge "javac 9 -target 1.9: Move bootclasspath jars onto classpath."
am: e1b94da7c8

Change-Id: Ib422d959a9276f165293987fb920600d66103c38
2018-01-29 10:56:02 +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
744c286b07 Merge "Add flag to control hidden API warning toasts"
am: 4e6c5218db

Change-Id: I1b297c855efce571a8987d773d2d11f9bf67943a
2018-01-29 10:27:30 +00:00
David Brazdil
4e6c5218db Merge "Add flag to control hidden API warning toasts" 2018-01-29 10:22:10 +00:00
Tianjie Xu
8a7ed9f771 Double check the sha1 for ranges during package generation
Check that the Sha1 for src&tgt ranges are correct before computing
patches. This adds ~6 seconds overhead for ~2400 commands.

Bug: 71908713
Test: Generate an incremental package from angler 4208095 to 4442250.
Change-Id: I8cf8ce132fb09a22f7d6689274ddb4a27770be76
2018-01-28 01:54:52 +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
71bea86caa Merge "Fix multilib test data being installed twice to the same place"
am: f9d8f6fa7d

Change-Id: I3c9ccd55a715a21bee97afc35f09329c2f6545b0
2018-01-27 03:49:49 +00:00
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
Paul Duffin
275d713b59 Merge "Ensure framework-oahl-backward-compatibility is installed" 2018-01-26 22:36:45 +00: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
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