Commit Graph

46771 Commits

Author SHA1 Message Date
Dan Willemsen
6dbb33dfad Mark BUILD_NUMBER as obsolete, more vars as readonly
In preparation for moving BUILD_NUMBER and FILE_NAME_TAG handling to
soong_ui, mark BUILD_NUMBER as obsolete and FILE_NAME_TAG as readonly.

Later changes will remove BUILD_NUMBER entirely, and move FILE_NAME_TAG
handling into the kati packaging step via dist-for-goals renames.

Test: build_test on master
Change-Id: I0e340d32fe0cb6296d3b5a7fec349b50632d044e
2018-10-22 15:20:26 -07:00
Treehugger Robot
4c95ffa8ef Merge "Remove USE_CLANG_LLD[=false]" 2018-10-22 20:26:27 +00:00
Colin Cross
1e0b2296ad Merge "Always define sdk_addon as phony" 2018-10-22 18:22:48 +00:00
Colin Cross
d0dbeb3758 Always define sdk_addon as phony
dist-write-files will add dist targets to the sdk_addon target,
but the sdk_addon target is not declared as phony when building
with mm (ONE_SHOT_MAKEFILE set), causing:
build/make/core/main.mk:1495: error: writing to readonly directory: "sdk_addon"

Always define sdk_addon as phony even if ONE_SHOT_MAKEFILE is set.

Bug: 118144231
Test: mm
Change-Id: I99d14a98a7597ebd694c765f94b0d6f4486860dc
2018-10-22 10:42:44 -07:00
Treehugger Robot
5546a543ce Merge "Put maxTargetSdk=P APIs onto light greylist." 2018-10-22 15:56:49 +00:00
Mathew Inwood
bcde1c52a6 Put maxTargetSdk=P APIs onto light greylist.
Since the per-SDK level enforcement support is not ready in ART yet, we
can't implement the correct enforcement for maxTargetSdk=P. Putting these
APIs on the dark greylist causes problems for existing apps, so put them
on the light greylist instead.

Test: m
Bug: 117899984
Change-Id: Ib3dad2f50eb6a769ba9f21cec4bac01275888ef6
2018-10-22 13:44:15 +01:00
David Brazdil
6a038d662b Merge "Add UNSAFE_DISABLE_HIDDENAPI_FLAGS to skip hiddenapi processing" 2018-10-22 12:43:39 +00:00
Anton Hansson
2bfa7401c7 Merge "Re-add product_MODULES" 2018-10-22 12:28:56 +00:00
Dan Willemsen
2eea59973b Remove USE_CLANG_LLD[=false]
Test: treehugger
Change-Id: I6dd632e9501f82b22f3f0c084039808e37b37742
2018-10-21 19:55:40 -07:00
Treehugger Robot
f1dafa30e4 Merge "Fix creating _dist_<goal> targets under !dist" 2018-10-21 17:55:58 +00:00
Dan Willemsen
c2fdc230fc Fix creating _dist_<goal> targets under !dist
I had initially thought that we would have created the rule when marking
it as PHONY, but that's apparently not the case.

Bug: 117463001
Test: m test-art-host-gtest
Change-Id: I5e397423dfb138725db0e3e07b2630f8e872bb12
2018-10-21 08:56:27 -07:00
Treehugger Robot
b519ed5983 Merge "Stop passing DIST_DIR to Soong" 2018-10-21 07:59:14 +00:00
Dan Willemsen
3e8eb377db Stop passing DIST_DIR to Soong
Test: m dist
Change-Id: I812606595703299f5e333d4e62bc1abeaad15c05
2018-10-20 21:37:44 -07:00
Treehugger Robot
b4b876f6a9 Merge "Fix dist-for-goals with no targets" 2018-10-21 03:07:04 +00:00
Dan Willemsen
c904e48cc5 Fix dist-for-goals with no targets
Bug: 117463001
Test: m dist vts
Change-Id: I9bfe01472dcf3d3729a109e4de383d35e3af9df0
2018-10-20 16:59:41 -07:00
Dan Willemsen
ac270964f1 Merge changes from topic "refactor_dist"
* changes:
  Create a new kati packaging step; move dist
  Refactor common makefile fragments
2018-10-20 22:50:10 +00:00
Dan Willemsen
78c40be560 Create a new kati packaging step; move dist
Instead of looking at `dist` and DIST_DIR directly in the Kati Build
step, always write out information about every call to dist, then create
the rules in another ckati run.

So instead of having:

  dist:    <goal> -> <dist> -> <output>
                \______________↑

  nodist:  <goal> -----------> <output>

Always use another phony target in the Kati Build step:

   <goal> ---> <output>
        \----> _dist_<goal>

Then in the packaging step (which is much faster), choose between dist
and no dist:

  dist:   _dist_<goal> -> <dist> -> <output>

  nodist: _dist_<goal>

Bug: 117463001
Test: m dist
Change-Id: Ic96bb6356740300dd3113f6ed699e6a619360c40
2018-10-20 21:44:44 +00:00
Dan Willemsen
7ddc50a066 Refactor common makefile fragments
In preparation for setting up another Kati stage, move some common
settings and tools into a common folder. This way it's a bit easier to
see that they're safe to use, and that they shouldn't depend on anything
outside of the common folder.

Bug: 117463001
Test: build-aosp_arm.ninja is the same before and after
Change-Id: Ief4b75a4dbe45b73ffd03bf32c60695c816d979d
2018-10-20 14:43:58 -07:00
Treehugger Robot
17c9e2a296 Merge "Workaround Legancy GSI for some Wifi firmware" 2018-10-19 22:22:03 +00:00
Bill Yi
0f693d3f25 Merge "Merge pi-dr1-dev to aosp-master" 2018-10-19 21:21:30 +00:00
Florian Mayer
0c41ee3b35 Merge "Build heapprofd per default." 2018-10-19 20:45:02 +00:00
Bill Yi
342e71668c Merge pi-dr1-dev to aosp-master
Change-Id: I3d070795c58033b318ff9e3e1e7acd0511b84c4d
2018-10-19 12:20:09 -07:00
David Brazdil
8a6b9a7baf Add UNSAFE_DISABLE_HIDDENAPI_FLAGS to skip hiddenapi processing
Setting environment variable UNSAFE_DISABLE_HIDDENAPI_FLAGS=true
will skip the build step which annotates dex files with information
about public and non-public API membership. This is meant to speed
up incremental local builds.

USE AT OWN RISK: Dex files built with this flag will execute with
hidden API access checks disabled and therefore may exhibit different
behaviour compared to production code.

WARNING: Some JARs cannot be compiled with this flag as ART hardcodes
hidden API access flags of intrinsified methods. Attempting to compile
dex files containing such methods will trigger an assertion.

Test: UNSAFE_DISABLE_HIDDENAPI_FLAGS=true mmm frameworks/base
Bug: 113278235
Bug: 112388925
Change-Id: I51fe99ab53e1bb2aa0db64b22a321dd1e1ed47e1
2018-10-19 20:16:49 +01:00
SzuWei Lin
11892a4b9a Workaround Legancy GSI for some Wifi firmware
Bug: 117963911
Test: Turn on wifi with aosp_arm64_ab-userdebug on Pixel 1/2/3 devices
Change-Id: I0d516876522a687709ff21cbfc5bc0cc415b8335
2018-10-19 17:37:20 +08:00
Tao Bao
395b920354 Merge "releasetools: Log to stdout when running tests."
am: 60c3421896

Change-Id: I3d3d3c586833297ec8e030c59ab4dbae546ac5b1
2018-10-18 21:07:59 -07:00
Treehugger Robot
60c3421896 Merge "releasetools: Log to stdout when running tests." 2018-10-19 02:58:47 +00:00
Colin Cross
138265ff5c Merge "Remove strip.sh intermediates to save space"
am: 839cf8f7a9

Change-Id: I3b8f30bc00e24ed2e467508963d546320326b28c
2018-10-18 18:51:59 -07:00
Treehugger Robot
839cf8f7a9 Merge "Remove strip.sh intermediates to save space" 2018-10-19 01:26:33 +00:00
Tao Bao
898a924904 releasetools: Log to stdout when running tests.
This sets up the root logger while running tests. It also logs to
stdout, as our Python test result parser doesn't like outputs from
stderr.

Test: `python -m unittest discover build/make/tools/releasetools \
          > /dev/null` doesn't print log lines.
Change-Id: Ic99711bd458bc4b67b38226786fed604c2168476
2018-10-18 15:05:49 -07:00
Colin Cross
3c6d5480c5 Remove strip.sh intermediates to save space
Add a cleanspec to removed unused strip.sh intermediates.  Saved
32GB on my AOSP checkout that had been used to build multiple
devices.

Test: m nothing
Change-Id: Ia319a2feacdd1a1ac8b88a6783766c370438ce12
2018-10-18 14:19:56 -07:00
Andreas Gampe
a5301878fe Merge "Build: update warn.py for Errorprone 2.3.2"
am: d68c98538d

Change-Id: Iabe71ecc071f2415e2f9fb915b6ae0e1c7219d11
2018-10-18 11:57:15 -07:00
Treehugger Robot
d68c98538d Merge "Build: update warn.py for Errorprone 2.3.2" 2018-10-18 18:45:16 +00:00
Tao Bao
c4c8c99741 Merge "releasetools: Switch to Python logging."
am: 185ce5ffb3

Change-Id: I02869f7877f311a1f7640ef4f5ca3c613db0d72b
2018-10-18 11:33:21 -07:00
Tao Bao
185ce5ffb3 Merge "releasetools: Switch to Python logging." 2018-10-18 17:31:29 +00:00
Matt Wachowski
c135db19b4 Merge "Supporting change for aosp/771168"
am: ac02d67652

Change-Id: I8b47cbc2fae8a574588e3c60f8e5c90a81a16e87
2018-10-18 09:28:37 -07:00
Matt Wachowski
ac02d67652 Merge "Supporting change for aosp/771168" 2018-10-18 16:20:12 +00:00
Anton Hansson
a38f6aac3a Merge "Remove PRODUCT_SHIPPING_API_LEVEL in mainline_system"
am: 058f33ec0f

Change-Id: Ie9ca08191c1b3b75aef94aad1a7a1458a5f3dd67
2018-10-18 09:05:59 -07:00
Anton Hansson
058f33ec0f Merge "Remove PRODUCT_SHIPPING_API_LEVEL in mainline_system" 2018-10-18 15:32:47 +00:00
Anton Hansson
b65a5ba193 Remove PRODUCT_SHIPPING_API_LEVEL in mainline_system
Let this be defined in the leaves instead. As is it frequently causes
problems where the product inheriting this also inherit another value
of PRODUCT_SHIPPING_API_LEVEL, leading to invalid values unless
overridden again.

Bug: 80410283
Test: lunch mainline_arm64; m nothing
Test: lunch mainline_system_arm64; m nothing
Change-Id: Id08b6cc0cd8815404e548c521c9e40706ba8ca16
2018-10-18 13:40:22 +01:00
Anton Hansson
c15e717584 Merge "Add PresencePolling to mainline_system"
am: fc1e1a54cd

Change-Id: If92e8d9c57598c91b720fe71e9c6134deaa6e8d9
2018-10-18 02:04:16 -07:00
Anton Hansson
e7334299df Merge "Re-submit "Add trailing slash to mainline path claims.""
am: 471a45b952

Change-Id: I99cb86a27887df6d2bf0cb922621c7c52e35aa39
2018-10-18 01:52:34 -07:00
Anton Hansson
fc1e1a54cd Merge "Add PresencePolling to mainline_system" 2018-10-18 08:04:19 +00:00
Anton Hansson
471a45b952 Merge "Re-submit "Add trailing slash to mainline path claims."" 2018-10-18 08:03:53 +00:00
bohu
ef14e322c2 Merge "fix generic_x86_arm"
am: 569ddd300b

Change-Id: I66338017c69b4ecfad9c630b1f9cbc6c45041d86
2018-10-18 00:27:28 -07:00
Treehugger Robot
569ddd300b Merge "fix generic_x86_arm" 2018-10-18 06:59:39 +00:00
Dan Willemsen
dfb64ca033 Merge "Remove check_emu_boot, it's no longer necessary"
am: 6393560856

Change-Id: I89e3fc589dd2840fdea28b98f0de400d51a2a95a
2018-10-17 17:20:50 -07:00
Matt Wachowski
40afa81053 Supporting change for aosp/771168
Submitting the change above before this one will "work" for now but we
want to pass vbmeta.img instead of system.img for the more robust
solution.

Bug: 78113934
Test: Built on my local machine.  Asserted that VerifiedBootParams.proto
exists.  Asserted that the emulator boots correctly with this file.

Change-Id: Ie91f49a3c7d49fc667e3f12e7e3866c3d9eb1960
2018-10-17 16:38:53 -07:00
Treehugger Robot
6393560856 Merge "Remove check_emu_boot, it's no longer necessary" 2018-10-17 23:22:47 +00:00
bohu
9b4e805a4d fix generic_x86_arm
To make the generic_x86_arm bootable.
Third party translabor binary can be added on the resulting
system.img and be tested at least on emulator.

BUG: 117673798

Change-Id: Iffbcf9217bbedc12ba83a4851e84ecbf299bf8e7
Merged-In: Iffbcf9217bbedc12ba83a4851e84ecbf299bf8e7
2018-10-17 21:57:15 +00:00
Dan Willemsen
b1e3357962 Remove check_emu_boot, it's no longer necessary
Bug: 117859878
Test: treehugger
Change-Id: I4e9ade9b5b9dc7d494101bbd0b0eb2b245244337
2018-10-17 11:13:07 -07:00