Commit Graph

44079 Commits

Author SHA1 Message Date
Justin Yun 24c5669dc2 Merge "Update current.txt for vndk libs list" am: 189b97e652
am: 492c519a86

Change-Id: I12d9500ba61864a2771988fb3a9db7d68f8f028b
2018-04-11 23:24:55 -07:00
Justin Yun 492c519a86 Merge "Update current.txt for vndk libs list"
am: 189b97e652

Change-Id: Ie3b36e8b0d8ef40e7424bce01bab13423d282b6a
2018-04-11 23:20:48 -07:00
Justin Yun 189b97e652 Merge "Update current.txt for vndk libs list" 2018-04-12 06:04:16 +00:00
Justin Yun ef2261475a Update current.txt for vndk libs list
Update latest vndk libraries list to exclude architecture
dependent libraries.

Bug: 77931086
Test: m check-vndk-list
Change-Id: I205262bef549cff508071da5a4d02c0b115d33e3
2018-04-12 14:34:31 +09:00
John Muir e3ebfbc16a Merge "notice_files: Disable NOTICE files for FAKE modules." am: 57fdba09a9
am: dd38cece28

Change-Id: Iad7afe5af043be949fb0833bd7141d2e8ad1f708
2018-04-11 15:48:02 -07:00
John Muir dd38cece28 Merge "notice_files: Disable NOTICE files for FAKE modules."
am: 57fdba09a9

Change-Id: I7fe3921c6dae61c0b5ef11e71e164d1def8f1837
2018-04-11 15:44:29 -07:00
Treehugger Robot 57fdba09a9 Merge "notice_files: Disable NOTICE files for FAKE modules." 2018-04-11 22:34:34 +00:00
Elliott Hughes 7fc11ee5d4 Merge "Move logwrapper to shell_and_utilities." am: 3204fd4bed
am: 97e6bd49be

Change-Id: I2a208e85c3b4074c80a70a82a9fd18978905ef97
2018-04-11 15:31:01 -07:00
Elliott Hughes 97e6bd49be Merge "Move logwrapper to shell_and_utilities."
am: 3204fd4bed

Change-Id: I454844357e9d190aaf89d0fd74f6ceb27a54d7b8
2018-04-11 15:27:56 -07:00
Elliott Hughes 3204fd4bed Merge "Move logwrapper to shell_and_utilities." 2018-04-11 22:14:28 +00:00
John Muir 58d96b150e notice_files: Disable NOTICE files for FAKE modules.
Currently the build system will automatically attribute a NOTICE
file with the target of $(BUILD_PHONY_PACKAGE). This shouldn't
be the case.

Disable notice file inclusion for fake targets so that the
/fake_packages/blah_blah-timestamp paths don't show up in
NOTICE.xml.gz.

Bug: 77910458
Test: NOTICE files are not attributed to fake targets.
Change-Id: Ia942cac41b750efbd5a23d896d85ac0820ee8b4e
2018-04-11 13:07:13 -07:00
Anton Hansson 395092db03 Merge "Consolidate the logic for the sdk prebuilt module names." am: 9b72b53a24
am: 762e03ad41

Change-Id: I79ba2766028f2f26836a3a6d99eb5e8311f31921
2018-04-11 02:27:37 -07:00
Anton Hansson 762e03ad41 Merge "Consolidate the logic for the sdk prebuilt module names."
am: 9b72b53a24

Change-Id: Ib02ff60a9d4539920a9bc3e34966be1132e53607
2018-04-11 02:21:27 -07:00
Anton Hansson 9b72b53a24 Merge "Consolidate the logic for the sdk prebuilt module names." 2018-04-11 09:10:33 +00:00
Dan Willemsen b2adc8ebeb [automerger skipped] Merge "Disable warnings for unknown modules in package-modules.mk" into pi-dev
am: 0028485c94  -s ours

Change-Id: I980dadd54a9fce9b12050f83bcfba8aae3ab1fa4
2018-04-11 00:46:34 -07:00
TreeHugger Robot 0028485c94 Merge "Disable warnings for unknown modules in package-modules.mk" into pi-dev 2018-04-11 07:32:24 +00:00
Dan Willemsen 148369f632 [automerger skipped] Merge "Delay eval to save memory use in create-suite-dependencies" into pi-dev
am: 6536add287  -s ours

Change-Id: I15af27fef7f22ba96b9d53b4e637a92476cff743
2018-04-11 00:22:27 -07:00
Colin Cross a876409152 [automerger skipped] Don't depend on R.txt)
am: 17de09f74d  -s ours

Change-Id: I038a08cef874c0f348893b028b7f0789dc182cb4
2018-04-11 00:21:55 -07:00
TreeHugger Robot 6536add287 Merge "Delay eval to save memory use in create-suite-dependencies" into pi-dev 2018-04-11 07:15:17 +00:00
Dan Willemsen 5046d4c749 Disable warnings for unknown modules in package-modules.mk
We've had these warnings for a while, but we've still got a lot of
warnings that people have been trained to ignore. Lets just silence them
for now.

The Merged-In is just a random change from AOSP that isn't in pi-dev, to
stop this from being merged to master, where I'm just fixing the
warnings.

Bug: 77883700
Test: m  <fewer warnings>
Change-Id: I00d8173a527760d62dca5837bcc86d5f03b87e83
Merged-In: I78ca65e6f0c81f09e7da848eda797b3a8f97a521
2018-04-10 22:44:28 -07:00
Colin Cross 17de09f74d Don't depend on R.txt)
There is an extra ) in the implicit output path for R.txt, which causes
the rule to rerun every time because of a missing output file.  There
is already an implicit output for R.txt on line 180 (which is why
the incorrect path didn't cause an immediate "No rule to generate R.txt"
error), so just remove the incorrect one.

Bug: 77244156
Test: m checkbuild && m checkbuild
Change-Id: Id960ee211b89a9a5f5104cdcac23bc3124742145
Merged-In: Id960ee211b89a9a5f5104cdcac23bc3124742145
(cherry picked from commit ac48f41ba5)
2018-04-10 22:28:43 -07:00
Dan Willemsen 4cfebe0ac4 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).

Bug: 77879502
Test: build-aosp_arm.ninja is identical
Change-Id: If45a4796f1bbf6d67dff388ea877a6115a4e06f4
Merged-In: If45a4796f1bbf6d67dff388ea877a6115a4e06f4
(cherry picked from commit a4155e8512)
2018-04-10 22:16:49 -07:00
Colin Cross c455d63948 Merge "Don't depend on R.txt)" am: 2754a92f2c
am: 54340d913e

Change-Id: I7387787691d621ac259a8c77efd480cdcd373b1e
2018-04-10 21:18:20 -07:00
Colin Cross 54340d913e Merge "Don't depend on R.txt)"
am: 2754a92f2c

Change-Id: I0330408470fa28549358b0695e4a65f9ac33a92c
2018-04-10 21:12:34 -07:00
Treehugger Robot 2754a92f2c Merge "Don't depend on R.txt)" 2018-04-11 04:03:50 +00:00
Bo Hu e09ce695e8 Merge "emulator: use puresoftware keymaster" into pi-dev
am: c1761dab74

Change-Id: I9dca57b96a5c0996393120e012ca56baf24d101a
2018-04-10 19:02:37 -07:00
Dan Willemsen fb3eeea64a Merge "Add variables for configuring Soong plugins" am: de61b23ffc
am: 3ae1f7af36

Change-Id: I5abe5931423d25a8314914bc81ba2a38a3439a94
2018-04-10 18:58:05 -07:00
Bo Hu c1761dab74 Merge "emulator: use puresoftware keymaster" into pi-dev 2018-04-11 01:55:02 +00:00
Dan Willemsen 3ae1f7af36 Merge "Add variables for configuring Soong plugins"
am: de61b23ffc

Change-Id: I4ee0ad56c022bf40233b2ebb9266d37331c35f98
2018-04-10 18:52:29 -07:00
Dan Willemsen de61b23ffc Merge "Add variables for configuring Soong plugins" 2018-04-11 01:45:49 +00:00
Justin Yun 6414552ebb Merge "Update current.txt for vndk" am: 5f6cd275db
am: ac44bf7152

Change-Id: I62d4db30a94985f3e1c8d764278595b9c1116418
2018-04-10 17:41:47 -07:00
Justin Yun ac44bf7152 Merge "Update current.txt for vndk"
am: 5f6cd275db

Change-Id: I30a27fb3ac338da9edc443ba30fa38a690f926e2
2018-04-10 17:36:05 -07:00
Treehugger Robot 5f6cd275db Merge "Update current.txt for vndk" 2018-04-11 00:24:28 +00:00
Colin Cross ac48f41ba5 Don't depend on R.txt)
There is an extra ) in the implicit output path for R.txt, which causes
the rule to rerun every time because of a missing output file.  There
is already an implicit output for R.txt on line 180 (which is why
the incorrect path didn't cause an immediate "No rule to generate R.txt"
error), so just remove the incorrect one.

Bug: 77244156
Test: m checkbuild && m checkbuild
Change-Id: Id960ee211b89a9a5f5104cdcac23bc3124742145
2018-04-10 16:27:53 -07:00
Dan Willemsen eaacf5b285 Add variables for configuring Soong plugins
See the Soong commit for detailed usage.

Bug: 76168832
Test: define some variables, use them
Change-Id: Ia8af5b6ec1cb3f12cbc1fee582a309eebb340b7c
2018-04-10 15:51:53 -07:00
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