Commit Graph

3598 Commits

Author SHA1 Message Date
Isaac Chen 3137955323 Merge "ARM emulator: aosp_arm on 64-bit binder and kernel" into pi-dev
am: 6bb69c4c3d

Change-Id: I492a34654f88a2191f23160722461b9cd85af4b0
2018-04-16 22:28:51 -07:00
TreeHugger Robot 6bb69c4c3d Merge "ARM emulator: aosp_arm on 64-bit binder and kernel" into pi-dev 2018-04-17 05:22:35 +00:00
Justin Yun 48db42ff7b Update the final 28.txt before release.
am: 41eb5058bf

Change-Id: I9ab82a1d2c7a9a94eca974215cf10e2d9a604e0a
2018-04-16 16:13:33 -07:00
Andrew Hsieh 30791d858f Merge "Update current.txt to add libminijail.so" into pi-dev 2018-04-16 22:54:58 +00:00
Andreas Gampe 875a95a494 Merge "Revert "Build: Support for compiled-classes file"" am: 1cd44482db
am: 7033cc2c6f

Change-Id: I83a5d50c39dc0c83f133121f0680d99388e17daa
2018-04-16 11:17:24 -07:00
Justin Yun 41eb5058bf Update the final 28.txt before release.
Add libminijail.so to VNDK list.

Bug: 63866913
Test: Build sailfish and libminijail.so should be installed into
/system/lib[64]/vndk/libminijail.so instead of
/vendor/lib[64]/libminijail.so.

Change-Id: I611598f0fc700dcee7829badb975479803c8b7ad
2018-04-16 06:52:54 +00:00
Justin Yun 0b2f5279d6 Update current.txt to add libminijail.so
Add libminijail.so to VNDK list.

Bug: 63866913
Test: Build sailfish and libminijail.so should be installed into
/system/lib[64]/vndk/libminijail.so instead of
/vendor/lib[64]/libminijail.so.

Change-Id: Iaddfc4f4810458e5061841a9c4b99eb6052934c7
Merged-In: Ie90111c10781cc366faa711027f279601709fe56
2018-04-14 05:17:19 +00:00
Wale Ogunwale 4079cd2259 Merge "Freeze VNDK list for finalizing P SDK" into pi-dev
am: 03b6fa6a64

Change-Id: Id729269a0e333a3b6ed5ed32ca4735f8ebbbfaf3
2018-04-13 14:07:13 -07:00
Wale Ogunwale 03b6fa6a64 Merge "Freeze VNDK list for finalizing P SDK" into pi-dev 2018-04-13 20:53:03 +00:00
Ruchi Kandoi 85bc17b549 Merge "Adds SecureElement apk to core.mk" into pi-dev
am: 08afb09c5c

Change-Id: I21d6a5fa950a017881d9ffd68cf6a8f2414f322f
2018-04-13 13:45:08 -07:00
TreeHugger Robot 08afb09c5c Merge "Adds SecureElement apk to core.mk" into pi-dev 2018-04-13 20:30:26 +00:00
Andreas Gampe 35ab4203ef Revert "Build: Support for compiled-classes file"
This reverts commit 96a522037f.

Bug: 76145463
Test: m
Change-Id: I5a368cd01812e16869352ec219eae095df4919c4
2018-04-13 13:08:13 -07:00
Justin Yun 32e3453212 Check vndk list on build
Check current vndk list on build time with current.txt.
If the vndk list is changed, the current.txt must be updated
manually. Otherwise the build will report an error.

The list is not allowed to be updated for the release versions.

Bug: 77816590
Bug: 67002788
Test: run 'm check-vndk-list' and check if build is successful.
Test: 1. change vndk property of a module and run 'm check-vndk-list'
         and check if build is failed.
      2. run 'update-vndk-list.sh'.
      3. run 'm check-vndk-list' again and check if build is
         successful.

Change-Id: I4caeb9eafa898f175d40f96125b9997edaeadbeb
Merged-In: I4caeb9eafa898f175d40f96125b9997edaeadbeb
(cherry picked from commit 27caa055b9e53f65b9d0aec126e05dab32145717)
2018-04-13 08:12:35 +00:00
Justin Yun 056289405a Merge "Check vndk list on build" am: 93dcc11c17
am: 471c65c820

Change-Id: I25c4df8f50a403e60613516573cd2909ea1592e5
2018-04-13 00:35:45 -07:00
Justin Yun 36e465a4b2 Check vndk list on build
Check current vndk list on build time with current.txt.
If the vndk list is changed, the current.txt must be updated
manually. Otherwise the build will report an error.

The list is not allowed to be updated for the release versions.

Bug: 77816590
Bug: 67002788
Test: run 'm check-vndk-list' and check if build is successful.
Test: 1. change vndk property of a module and run 'm check-vndk-list'
         and check if build is failed.
      2. run 'update-vndk-list.sh'.
      3. run 'm check-vndk-list' again and check if build is
         successful.

Change-Id: I4caeb9eafa898f175d40f96125b9997edaeadbeb
2018-04-13 05:20:15 +00:00
Justin Yun d27468508a Update current.txt to latest vndk list
Add libneuralnetworks.so to LL-NDK list.

Bug: 77161122
Test: m check-vndk-list
Change-Id: Ic2820103bbacdef4a299670cdb6497ab5c7af3c0
Merged-In: Ia5d27d044e2bf67872238154a32d0b96f6933148
2018-04-13 05:10:42 +00:00
Justin Yun 53d312828f Freeze VNDK list for finalizing P SDK
Bug: 77816590
Test: build and boot
Change-Id: If6dd1530c4f15a783543b2102a5ddde1b9218735
2018-04-13 02:52:34 +00:00
Justin Yun 681cdaf454 Update current.txt for current vndk list
current.txt must be updated to have current vndk list in each branch.

Bug: 77816590
Test: m check-vndk-list
Change-Id: I16dcf73dde0dedca1c6639d6ea4158992febcb67
Merged-In: Ia5d27d044e2bf67872238154a32d0b96f6933148
2018-04-13 02:51:10 +00:00
Justin Yun b9346013b6 Exclude libclang_rt from checking vndk list
libclang_rt libs are prebuilt libs that have different names by the
architecture they are built.

Bug: 77931086
Bug: 77816590
Bug: 67002788
Test: 'm check-vndk-list' for various architectures.
Change-Id: Iacb3979b6e5df7e9ba8073470aab23c603b4db55
Merged-In: Iacb3979b6e5df7e9ba8073470aab23c603b4db55
(cherry picked from commit 016020923a)
2018-04-13 01:22:02 +00:00
Justin Yun 241dea0c15 Update current.txt for current vndk list
current.txt must be updated to have current vndk list in each branch.

Bug: 77816590
Test: m check-vndk-list
Change-Id: Ia5d27d044e2bf67872238154a32d0b96f6933148
2018-04-13 08:54:26 +09:00
Ruchi Kandoi d7568287df Adds SecureElement apk to core.mk
Test: Build and install images
Bug: 64994044
Change-Id: I34ccf346bc9befb78fd7909a6ab6b2d1059b9ed3
2018-04-12 14:28:50 -07:00
Elliott Hughes 53f0d2910f Move logwrapper to shell_and_utilities.
Bug: 77284669
Test: builds
Change-Id: I22549e321d88007480e7d9d961e41db2b9a26a41
Merged-In: I22549e321d88007480e7d9d961e41db2b9a26a41
(cherry picked from commit d5ad9346fb)
2018-04-12 12:13:02 +00:00
Isaac Chen dfa8e7796b ARM emulator: aosp_arm on 64-bit binder and kernel
Starting in P, all 32-bit and 64-bit architectures use 64-bit
binder interface. This is similar to ag/3576770 for x86.

Bug: 71861550
Test: the following products can boot to home screen successfully:
    lunch aosp_arm-userdebug; m -j; emulator
    lunch sdk_phone_armv7-userdebug; m -j; emulator
Change-Id: Ibe1f53a5798342555e2e84395a13b48d461f483d
2018-04-12 16:06:26 +08:00
Justin Yun 54df86f613 Merge "Exclude libclang_rt from checking vndk list" am: e1f78121c4
am: 9596790645

Change-Id: I543609e971a7b3c1b3dfc459afa7af6630655b65
2018-04-12 00:54:44 -07:00
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 016020923a Exclude libclang_rt from checking vndk list
libclang_rt libs are prebuilt libs that have different names by the
architecture they are built.

Bug: 77931086
Bug: 77816590
Bug: 67002788
Test: 'm check-vndk-list' for various architectures.
Change-Id: Iacb3979b6e5df7e9ba8073470aab23c603b4db55
2018-04-12 06:17:23 +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
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 3204fd4bed Merge "Move logwrapper to shell_and_utilities." 2018-04-11 22:14:28 +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
Bo Hu c1761dab74 Merge "emulator: use puresoftware keymaster" into pi-dev 2018-04-11 01:55:02 +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
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
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
Bo Hu 484c119059 Merge "Move emulator fstab to vendor for "system as root"" into pi-dev 2018-04-09 15:34:30 +00: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 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 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 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
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 6607ce7efa Merge "Change the default compiler filter for install to speed-profile" 2018-04-05 21:51:46 +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 af2e1f8487 Start moving add_lunch_combo to Make
Start deprecating add_lunch_combo, preferring a list of common choices
in each AndroidProducts.mk file.

This list will be validated so that we don't have typos:

https://android-review.git.corp.google.com/c/device/generic/car/+/619533

Or targets that no longer exist.

Bug: 77599627
Test: lunch
Test: lunch 34
Test: lunch aosp_x86_64-eng
Test: lunch aosp_<tab>
Change-Id: Ie0ddaa94cbd6cee26584f56f1706a8ec1333f87e
2018-04-04 17:14:47 -07:00