Commit Graph

44144 Commits

Author SHA1 Message Date
Elliott Hughes d5ad9346fb Move logwrapper to shell_and_utilities.
Bug: https://issuetracker.google.com/77284669
Test: builds
Change-Id: I22549e321d88007480e7d9d961e41db2b9a26a41
2018-04-10 14:50:13 -07:00
Anton Hansson 400673cf1e Consolidate the logic for the sdk prebuilt module names.
I'm making some changes to it, and found the names are scattered
in various places. Make a macro and re-use the logic instead.

Bug: 77525052
Test: make droid
Change-Id: I0f2da80b8b4d427353509b27ec720d024eee7a6e
2018-04-10 18:53:30 +01:00
Guang Zhu 3beba84770 delete tests baked into emulator system image
am: 8012f0fce5

Change-Id: I2489021823788b8efb73d5cc266a422e465bc7f0
2018-04-10 10:15:06 -07:00
bohu cbc7c1b2e1 emulator: use puresoftware keymaster
Currently emulator is using software keymaster
and this module will be removed soon.
Based on the suggestion of keymaster team,
the puresoftware keymaster should be used instead.
removing keystore.goldfish and keystore.ranchu
so puresoftware keymaster can be used.

BUG: 73378534
Test: build sdk_gphone_x86-userdebug
make -j
emulator
boots to homescreen
and pass majority of CtsKeystoreTestCases
failures drop from 100+ to 40+

Change-Id: I5093f5a0989e8aad0a69bbae3e8d789d8d8ae1bb
2018-04-10 07:25:30 -07:00
Justin Yun ac5527f765 Update current.txt for vndk
Update the current.txt for vndk libs in aosp.

Bug: 77816590
Test: m check-vndk-list
Change-Id: Ie90111c10781cc366faa711027f279601709fe56
2018-04-10 18:24:16 +09:00
Guang Zhu 8012f0fce5 delete tests baked into emulator system image
- tests are out of maintainence
- the checks were general functional tests on comms related
  areas and should be covered by the same tests across physical
  and virtual devices

Bug: 77496099
Test: build `make -j droid tests dist`
Change-Id: I72c88ebb82c43209cb2d9a2aad24a20562989c46
2018-04-09 20:19:45 -07:00
Dan Willemsen 5863fce2fb Merge "Delay eval to save memory use in create-suite-dependencies" am: f05573eb91
am: 239974e95a

Change-Id: Ie5c3b655d9cf9b8192b59583b4fe473a3a3a7f09
2018-04-09 19:50:15 -07:00
Dan Willemsen 239974e95a Merge "Delay eval to save memory use in create-suite-dependencies"
am: f05573eb91

Change-Id: Id156daa483e3b0c59de1d1f0a76a49a2b5367491
2018-04-09 19:44:54 -07:00
Treehugger Robot f05573eb91 Merge "Delay eval to save memory use in create-suite-dependencies" 2018-04-10 02:38:06 +00:00
Dan Willemsen a4155e8512 Delay eval to save memory use in create-suite-dependencies
Instead of passing the entire contents of
$(COMPATIBILITY.$(suite).FILES) to eval, which may keep that string
around, delay the evaluation of that, and the new files until inside the
eval.

This saves ~2.8GB: 7.4GB -> 4.6GB of ckati max resident memory for a
relatively small internal build. It also saves ~10% of the makefile
loading time (81 -> 73 seconds).

Test: build-aosp_arm.ninja is identical
Change-Id: If45a4796f1bbf6d67dff388ea877a6115a4e06f4
2018-04-09 16:30:06 -07:00
Ian Pedowitz 16ac20d21b Bump PLATFORM_PREVIEW_SDK_VERSION to 2 for P-Beta1
am: 191badd71b

Change-Id: I1745660da2ad8ab305f2525392a4dce1f03a8101
2018-04-09 13:20:26 -07:00
Ian Pedowitz 191badd71b Bump PLATFORM_PREVIEW_SDK_VERSION to 2 for P-Beta1
Change-Id: Ic4e94c90fb1f86283858a88777a92ae75d6b65ed
Fixes: 77801171
Test: N/A
2018-04-09 09:36:58 -07:00
Bo Hu 009fffb46a [automerger skipped] Merge "Move emulator fstab to vendor for "system as root"" into pi-dev
am: 484c119059  -s ours

Change-Id: I77a8817a15c5a19c271cb3d83cffa0289519ff75
2018-04-09 08:47:32 -07:00
Isaac Chen 8578e4f99c [automerger skipped] Move emulator fstab to vendor for "system as root"
am: 8b404192a0  -s ours

Change-Id: Ib02c8e46c3a3209381abbc9c222c4653bb59a19c
2018-04-09 08:46:51 -07:00
Bo Hu 484c119059 Merge "Move emulator fstab to vendor for "system as root"" into pi-dev 2018-04-09 15:34:30 +00:00
bohu 80c25dfb6a [automerger skipped] Merge "emulator: update fstab.ranchu installation for arm images" into pi-dev
am: fc0ee9086b  -s ours

Change-Id: I503a63964a6cedfab10a2517c6238028f0c32ffc
2018-04-09 05:02:21 -07:00
TreeHugger Robot fc0ee9086b Merge "emulator: update fstab.ranchu installation for arm images" into pi-dev 2018-04-09 11:54:46 +00:00
Dan Willemsen c7ecbfe34d Merge "Revert "Remove flags to turn overriding commands into errors"" am: 5c19615b55
am: 36850e37c9

Change-Id: Ic762fafaae579bd50960584878a4408ef1c47247
2018-04-06 17:21:02 -07:00
Dan Willemsen 36850e37c9 Merge "Revert "Remove flags to turn overriding commands into errors""
am: 5c19615b55

Change-Id: I1fb43f716921f4e30eede71205a8457f79470684
2018-04-06 17:10:12 -07:00
Treehugger Robot 5c19615b55 Merge "Revert "Remove flags to turn overriding commands into errors"" 2018-04-07 00:06:22 +00:00
Dan Willemsen e64f5300ea Merge "Remove our binary of ccache" am: 060067e341
am: dbff0730d6

Change-Id: Ic9a885f986ccfbe28ece85e32dbd495573ff561b
2018-04-06 15:02:13 -07:00
Dan Willemsen dbff0730d6 Merge "Remove our binary of ccache"
am: 060067e341

Change-Id: Ifd3fc2f5435c2e28d90605354f7d022d497e4e13
2018-04-06 14:57:42 -07:00
Treehugger Robot 060067e341 Merge "Remove our binary of ccache" 2018-04-06 21:47:38 +00:00
Dan Willemsen 07a7227776 Revert "Remove flags to turn overriding commands into errors"
This reverts commit 1d8e86139c.

Reason for revert: fixed art + mac bug

Change-Id: I53a4d490ef32270aaaa8051f5c44958d0bec6469
Test: on mac: m nothing
2018-04-06 21:00:17 +00:00
Dan Willemsen 19f96c9297 Merge "Remove flags to turn overriding commands into errors" am: dc348501f0
am: 9ea760ecd2

Change-Id: I155f5d5d4993fc12e11f5f7940905758c0be22f7
2018-04-06 11:46:32 -07:00
Dan Willemsen 9ea760ecd2 Merge "Remove flags to turn overriding commands into errors"
am: dc348501f0

Change-Id: I165afed0d34e170c9e81a76c80df849d5350fc51
2018-04-06 11:36:20 -07:00
Dan Willemsen dc348501f0 Merge "Remove flags to turn overriding commands into errors" 2018-04-06 17:54:36 +00:00
Dan Willemsen 1d8e86139c Remove flags to turn overriding commands into errors
This is a partial revert of I43b645658f468c23a5b9ebcfcd9d4516537db540

On at least a generic_x86 build internally:

art/build/Android.gtest.mk:121: error: overriding commands for target `Uncompressed', previously defined at art/build/Android.gtest.mk:101

Bug: 77611511
Test: none
Change-Id: I78ca65e6f0c81f09e7da848eda797b3a8f97a521
2018-04-06 10:50:45 -07:00
Dan Willemsen d9a2594d1f Merge "Allow boards to turn overriding commands into an error" am: 3c93dbfa61
am: 1533d14754

Change-Id: I032fbc08fc17fb4c4f5d7f4e1f2ace0560407276
2018-04-06 09:12:29 -07:00
Dan Willemsen 1533d14754 Merge "Allow boards to turn overriding commands into an error"
am: 3c93dbfa61

Change-Id: Ifa935de12bf7c0ff1d05ff2427de590af801232d
2018-04-06 09:09:08 -07:00
Treehugger Robot 3c93dbfa61 Merge "Allow boards to turn overriding commands into an error" 2018-04-06 16:02:08 +00:00
Calin Juravle 88d93cc53b Change the default compiler filter for install to speed-profile
am: 818abfe26b

Change-Id: Ic7000935e1dae4f7b49a96d7f3e33efeb9c3968a
2018-04-05 17:38:59 -07:00
Dan Willemsen ac406f5c68 Allow boards to turn overriding commands into an error
Many boards have warnings like this, saying that we defined a build
rule, but later something else came in and overrode it with something
else:

art/build/Android.gtest.mk:677: warning: overriding commands for target `test-art-target-gtest-cmdline_parser_test'
art/build/Android.gtest.mk:674: warning: ignoring old commands for target `test-art-target-gtest-cmdline_parser_test'

Beyond the obvious problem of replacing the rule with something else,
target-specific variables can be combined as well, leading to some very
strange problems.

Since so many boards still have problems like this, but we don't
currently have any global problems, add a flag so that we can mark
boards as not broken. This should prevent regressions while we clean up
the individual problems.

Once the non-broken devices number significantly more than the broken
devices, we'll switch this default. And once they're all cleaned up this
variable will become obsolete, and these warnings will always be errors.

Bug: 77611511
Test: lunch aosp_arm-eng; m nothing
Test: lunch aosp_marlin-eng; m nothing
Test: build_test on all downstream branches
Change-Id: I43b645658f468c23a5b9ebcfcd9d4516537db540
2018-04-05 17:26:35 -07:00
Calin Juravle 818abfe26b Change the default compiler filter for install to speed-profile
The install filter is speed-profile in order to enable the use of profiles
from the dex metadata files. Note that if a profile is not provided or if
it is empty speed-profile is equivalent to (quicken + empty app image).

Test: build & install an app
Bug: b/30934496

(cherry picked from commit b5dadc3a18)

Merged-Id: I6671792b6c846c570a45d3c6a9b9677bcc424b17
Change-Id: I6eb81934a0b7cbaec4ff4471bf465cd40967d40b
2018-04-06 00:00:39 +00:00
Steven Moreland 4b44087f6b Merge "Support manifest fragments." am: e543e409d2
am: b1f4a0d379

Change-Id: I94f8dd57206c5a8f37798e1d0b36bb1b9015ab3a
2018-04-05 16:24:25 -07:00
Steven Moreland b1f4a0d379 Merge "Support manifest fragments."
am: e543e409d2

Change-Id: I5b6ca6b1c5de82f2dc065c6bc499c6a8b3b7c7c8
2018-04-05 16:17:49 -07:00
Treehugger Robot e543e409d2 Merge "Support manifest fragments." 2018-04-05 23:09:14 +00:00
Dan Willemsen 7556703f0d Remove our binary of ccache
Our binary was rather old, and for a variety of reasons we haven't kept
it updated. We've been running into a handful of reliability issues that
would have been fixed with an update, and a few reproducibility /
correctness issues that may or may not be fixed with newer versions.

For local no-change full rebuilds, ccache can still save ~35% of the
build time (but adds a few minutes to initially populate the cache). But
most local uses should be using incremental builds anyways, not clean
rebuilds. Or you're doing builds of different configurations, which
wouldn't be cache hits either, and would make your cache even larger.

At a large scale, we haven't seen a significant performance difference
between having ccache on or off. This may be different if you've got
very good build locality, or a very large cache -- but if you've got
good build locality, it's reasonable to do incremental builds (not for
release builds, and while running `m installclean` in between builds).

So for our cases, we'd prefer the stability and correctness of not using
ccache, but if you still want to use ccache, continue setting USE_CCACHE
and also set CCACHE_EXEC to the path of your ccache executable.

Bug: 32748498
Bug: 72408185
Test: performance testing of USE_CCACHE=false vs true locally
Test: turned off ccache for a collection of targets
Test: CCACHE_EXEC=/usr/bin/ccache USE_CCACHE=true m
Change-Id: I7117fe3107bd98521051ae343038a38f7e855502
2018-04-05 15:25:59 -07:00
Calin Juravle b8cf643107 Merge "Change the default compiler filter for install to speed-profile" am: 6607ce7efa
am: 903e7cb737

Change-Id: I36e2d3b6b7b33f5b5dad8b97dfbe4431eed7398f
2018-04-05 15:14:29 -07:00
Calin Juravle 903e7cb737 Merge "Change the default compiler filter for install to speed-profile"
am: 6607ce7efa

Change-Id: I87d0fe37cc121dcd46eb03ae7fe4191f5a944da5
2018-04-05 15:07:24 -07:00
Calin Juravle 6607ce7efa Merge "Change the default compiler filter for install to speed-profile" 2018-04-05 21:51:46 +00:00
Steven Moreland 3629aa77da Support manifest fragments.
LOCAL_VINTF_FRAGMENTS/vintf_fragments are
used to specify what manifest fragments should be installed
by a target.

Test: fragments get installed to the right location
Test: broken fragment gets detected
Test: boot device and verify service is working and manifest is updated
Test: verify OTA package contains fragments
Bug: 66917623
Change-Id: I21abe65a31b8c3d255c8ccd80e102ff3acb23105
2018-04-05 11:26:35 -07:00
Tom Cherry a5f62b118c Merge "Convert liboemaids to oemaids_headers as a headers only library" into pi-dev
am: aa66121df1

Change-Id: Ic2a0b7ce5eb66759484787539300852a7f7bc957
2018-04-05 09:44:11 -07:00
Tom Cherry aa66121df1 Merge "Convert liboemaids to oemaids_headers as a headers only library" into pi-dev 2018-04-05 16:03:45 +00:00
Anton Hansson 6d3b0388b3 [automerger skipped] Merge "Enforce specifying sdk/private for apps." into stage-aosp-master
am: 16f8f3c4a7  -s ours

Change-Id: Ibf4f59a74c96f85356891a96f7eb311bbc74a0a5
2018-04-05 03:56:42 -07:00
Anton Hansson 16f8f3c4a7 Merge "Enforce specifying sdk/private for apps." into stage-aosp-master 2018-04-05 10:45:18 +00:00
Dan Willemsen 97bfc60b95 Merge "Start moving add_lunch_combo to Make" am: a975fe9c24
am: 7cc6f3313c

Change-Id: Ib207b87fff7438f01f05ca7de21e94930e0dd065
2018-04-04 20:39:38 -07:00
Dan Willemsen 7cc6f3313c Merge "Start moving add_lunch_combo to Make"
am: a975fe9c24

Change-Id: Ibcd5116efba20539da95a61207483df4a803eef2
2018-04-04 20:28:38 -07:00
Treehugger Robot a975fe9c24 Merge "Start moving add_lunch_combo to Make" 2018-04-05 03:14:07 +00:00
Ryan Prichard 60181e803e Fix mini_debug_info stripping when no symbols should be kept.
am: d809d369cb

Change-Id: Ibfdae4df1646047eaeef56f1262dec31dfc8cfff
2018-04-04 18:15:50 -07:00