Commit graph

3233 commits

Author SHA1 Message Date
Dan Willemsen
a362bf4e20 Add micro_bench to PRODUCT_PACKAGES_DEBUG
It's been converted to Soong, so can no longer use LOCAL_MODULE_TAGS. It
appears that some of the test runners expect to have it pre-installed.

Test: m; see it installed.
Change-Id: I189c9bbc2f2add90ac4f6841f4bf13852e4d579f
2018-05-09 17:33:12 -07:00
Dan Willemsen
aeaf4c2407 Add iotop to PRODUCT_PACKAGES_DEBUG
This was previously marked as LOCAL_MODULE_TAGS := debug, and is used
from dumpstate.

Test: iotop is still installed after remove the debug tag
Change-Id: I685456f52403a2d5c6fbbff1429c6af422ce26df
2018-05-04 18:53:34 -07:00
Isaac Chen
50958e2cae Merge "Enable VNDK for aosp_arm(64)" 2018-04-24 18:10:44 +00:00
Treehugger Robot
a0f595ec69 Merge "ARM emulator: aosp_arm on 64-bit binder and kernel" 2018-04-24 13:35:01 +00:00
Isaac Chen
5327e98b1a Enable VNDK for aosp_arm(64)
This is needed for the system images of aosp_arm(64) products to
be used as their respective GSIs in P, and for also aosp_arm(64)
products to boot with the current GSIs.

Bug: 78255604
Test: Built and booted the following products to home screen
    $ lunch aosp_arm-userdebug; m -j; emulator
    $ lunch aosp_arm64-userdebug; m -j; emulator
    # The system image, both userdebug and user builds, of
    # aosp_arm64 could also boot to home screen and browse
    # the network on a physical device.

Change-Id: I83b79fd4d4e6e522ee78c720fb8c5f6f67ee411b
Merged-In: I83b79fd4d4e6e522ee78c720fb8c5f6f67ee411b
(cherry picked from commit f71547079a)
2018-04-24 19:12:11 +08:00
Treehugger Robot
3527ff9b84 Merge "Make aosp_$arch system images closer to GSIs" 2018-04-24 02:19:23 +00:00
Isaac Chen
50e6251baa 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
Merged-In: Ibe1f53a5798342555e2e84395a13b48d461f483d
(cherry picked from commit 6f114c0110c466d2a117f3e531f9ea5170a121ee)
2018-04-24 10:10:50 +08:00
Isaac Chen
0c97f084c7 Make aosp_$arch system images closer to GSIs
This change modifies aosp_$arch product makefiles so their
system images can be closer to their respective GSIs.

The added contents in this CL are based on treble_common*.mk.
Contents specific to GSI are in aosp_$arch.mk.
Contents common to all devices are moved to full_base.mk.
Contents related to specific device are moved to device.mk.

BoardConfig related makefiles will be changed in another CL.

Bug: 70772101
Test: The following products can boot to home screen:
    $ lunch aosp_x86-userdebug; m -j; emulator
    $ lunch aosp_x86_64-userdebug; m -j; emulator
    $ lunch aosp_arm-userdebug; m -j; emulator
    $ lunch aosp_arm64-userdebug; m -j; emulator

Change-Id: I225a13dd74b3e748cc5d1705e1a453348b01d43f
Merged-In: I225a13dd74b3e748cc5d1705e1a453348b01d43f
(cherry picked from commit 164eed2e7d)
2018-04-24 10:03:14 +08:00
Pirama Arumuga Nainar
5a1598938f Remove obsolete (and broken) targets.
Bug: N/A
Test: N/A
Change-Id: I461e1adae9c0fec026f05cb890af2c4d8bd71e58
2018-04-20 15:18:22 -07: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
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
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
3204fd4bed Merge "Move logwrapper to shell_and_utilities." 2018-04-11 22:14:28 +00: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
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
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
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
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
6607ce7efa Merge "Change the default compiler filter for install to speed-profile" 2018-04-05 21:51:46 +00: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
Calin Juravle
b5dadc3a18 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
Change-Id: I895b5e2a1d8ff478f56b0f08cb589789d0743b54
2018-04-03 12:43:04 -07:00
Vishwath Mohan
e003a0a6ce Add components to enable CFI for.
This CL adds a list of components to enable CFI for on Arm64 product
configs.

This list is not directly used anywhere, but product configs can
inherit this to easily enable CFI for all tested components.

Bug: 63926619
Test: Inherit the product config; m -j60; verify that CFI is enabled
Change-Id: I56b6dfd5495639974a19623bc7aea9efeb9acff6
2018-04-02 14:35:31 -07:00
Zach Riggle
9323b7faf3 Add PRODUCT_PACKAGES_DEBUG_ASAN
This is a list of modules which should be installed by default, but only on
builds which are set up for Address Sanitizer (via SANITIZE_TARGET=address).

Additionally, add sanitizer-status to PRODUCT_PACKAGES_DEBUG so that all
userdebug builds will have the binary.  Currently, the module has the
"debug" tag but it may go away in the future.

Change-Id: I0bea4faf9c2a65380292471437e51ef8324b5af3
2018-03-30 21:09:50 +00:00
bohu
acc16846e3 emulator: update fstab.ranchu installation for arm images
Now init.ranchu.rc picks up fstab.ranchu from vendor/etc
instead of from /

BUG: 77233572
Change-Id: Ifd8639ac4cb883402c90de45b15b11077a60fa5f
2018-03-28 15:39:28 -07:00
Isaac Chen
4cf3e65be7 Move emulator fstab to vendor for "system as root"
In P, the root of the system image is used as the root of the
device, so all device (or vendor) spicific files need to be
moved to vendor partition. Relevant configuration files need to
be modified accordingly.

Bug: 76037265
Test: m -j; emulator # booted to home screen and
                     # checked fstab.ranchu is under vendor/etc

Change-Id: I88bfdbc1d7791f6afb64edf352b4898a50b41190
2018-03-21 10:40:44 +08:00
Treehugger Robot
252ff3d6b6 Merge "generic: BOARD_VNDK_VERSION := current" 2018-03-16 21:28:15 +00:00
Steven Moreland
5ee470be27 generic: BOARD_VNDK_VERSION := current
Bug: 70694532
Bug: 69526027
Test: lunch generic-userdebug, m -j, emulator (hangs >2 hours)

Change-Id: I377ab1ba2a5aea75096b27a1ec2366abf9d71fc4
2018-03-15 16:41:33 -07:00
Steven Moreland
adb7d43b5e generic_arm64: BOARD_VNDK_VERSION := current
Bug: 70694532
Bug: 69526027
Test: lunch sdk_gphone_arm64-userdebug, build, boot complete
    (unrelated /system/bin/sdcard crash)
Change-Id: I90a05f43caa479288b812075d06f57dae0a2fb2c
2018-03-15 15:19:06 -07:00
Justin Yun
746684376a Use default libnfc-nci.conf if not found in vendor/etc
If libnfc-nci.conf is not installed in vendor/etc, use default
configuration file in system/etc on GSI.

Bug: 72080121
Test: Install GSI and remove vendor/etc/libnfc-nci.conf.
      Check if nfc is available in settings menu.

Change-Id: Icc6e0b1d2b29adacf085cfa68566b064e736d3fa
2018-03-12 23:24:31 +00:00
Justin Yun
61c412ed05 Add ld.config.txt for wearables
When BOARD_VNDK_VERSION is set, the required VNDK libs for vendor
modules are installed in vndk directory.
The default namespace configuration cannot reach those directories
and fails to link the required libs.
By installing ld.config.txt, the namespace configurations for each
build target will be selected automatically. This does not affect
the devices that requires default namespace configurations.

Bug: 74242105
Test: lunch sdk_gwear_x86-userdebug; make -j; emulator
Change-Id: Ib1097846fcd9c123184b13b6fbcfcb9a72ca3d97
2018-03-07 13:27:24 +09:00
Weilun Du
1eb1568ce3 Remove ApiDemos and other packages modules in /data/app
Since API 27, PackageManager would not install random APKs that reside
in /data/app folder. They must be explicitly installed by "adb install"
instead.

BUG: 72750759
Change-Id: Ibc8e4e55e020439f5cf950d61fb7a815aa12fa6f
Signed-off-by: Weilun Du <wdu@google.com>
2018-03-04 00:37:57 +00:00
Treehugger Robot
01670eb141 Merge "emulator: use 4.4 kernel for x86 and x86_64" 2018-03-01 05:28:50 +00:00
bohu
856954ca6a emulator: use 4.4 kernel for x86 and x86_64
BUG: 72886167

Test: build aosp_x86 and aosp_x86_64
emulator boots complete

Change-Id: I388a775fe50ca60c938b097faf6bf4296d5c9a54
2018-02-28 11:41:41 -08:00
Yahan Zhou
12b5395c2f Add board name for emulator
VTS checks for ro.product.board before running. Emulator does not have
that value and causes an exception.

So let's add it to the emulator and call it goldfish_$(TARGET_ARCH).

BUG: 73741117
Test: vts-tradefed run vts, should run the tests
Change-Id: I6b00f2923bc9609d4d05c45d47ceddd2bd7be091
2018-02-27 18:11:48 -08:00
Treehugger Robot
7889d64db2 Merge "core_base: Remove duplicated Wifi modules from PRODUCT_PACKAGES" 2018-02-27 21:47:23 +00:00
Nick Kralevich
0aa64275e8 remove nnk from OWNERS
See https://android-review.googlesource.com/c/platform/system/sepolicy/+/626014

Also remove klyubin who is no longer at Google.

Test: none
Change-Id: I98534c0cc676e41129b73331ad0e71e7fc1aa1ab
2018-02-27 09:15:10 -08:00
Justin Yun
38e934a38e Create firmware and persist in GSI for arm_ab
Some SoC vendors require firmware and persist directores to mount.
This must be provided in GSI for arm_ab not only for arm64_ab.
Once the directories are moved to /vendor, these policies for root
must be removed.

Bug: 36764215
Bug: 73720182
Test: GSI boot with 32bit devices
Change-Id: Ic5c6bb615c39853d51d233c00d2d9e8ee2c57802
2018-02-26 23:10:47 +00:00
bohu
70fefe0066 emulator: remove opengles property
BUG: 73812167
Change-Id: I5bdc475c6bdd5bdcb32c5a12f49c18c6a391b95c
2018-02-23 09:08:45 -08:00
Bruno Martins
f6ae536800 core_base: Remove duplicated Wifi modules from PRODUCT_PACKAGES
* These packages are already being explicitly added in
   core_minimal makefile.

Change-Id: Ib79f5575efc3903fe901727bb238e8e0946db768
2018-02-23 11:41:52 +00:00
Mathew Inwood
0874887627 Include hiddenapi-whitelist.xml in the build.
See I1cbbd220c61b1b4b767c301f97096607ee902a7b which introduces this file.

Test: see related change I1cbbd220c61b1b4b767c301f97096607ee902a7b

Merged-In: I23dba07a5d83e4325227892e0a11a758e093effa
Change-Id: I0030718b932ea588120492fd8bcab1f389a40324
2018-02-22 11:10:57 +00:00
Meng Wang
bd48f84f17 Merge "AOSP telephony uses device/sample APN XML" 2018-02-15 17:37:57 +00:00
Meng Wang
5151c6c2b8 AOSP telephony uses device/sample APN XML
Bug: 73091197
Test: make - /system/etc/apns-conf.xml same as
      device/sample/etc/apns-full-conf.xml

Change-Id: I5e9651066e7a5d4de31d846daf3fe3120476b89f
2018-02-15 05:54:52 +00:00
bohu
72fa12db3c emulator: grant fingerprint hal data permission
Test: build sdk_gphone_x86-userdebug
launch emulator, enroll fingerprint, close emulator
relaunch emulator, check previously enrolled fingerprint still work

Change-Id: I27552509368f08cc6a7aa52b0e9efc5ae952469d
2018-02-14 15:37:31 -08:00
Christopher Ferris
649b8c1127 Add libc_malloc_hook to list of libraries.
Bug: 30561479

Test: Build from scratch and verify the library is present.
Change-Id: I53f30d694cff202ffc93491485ed3c845de07862
(cherry picked from commit 8c70d4de97)
2018-02-13 13:38:26 -08:00
Chenbo Feng
2b948a2259 Add bpfloader binary to system image
The bpfloader is a executable binary used by netd to load and attach
networking related bpf program at run time. It need to be flashed to
device when updating the system image. Currently this binary is only
used by devices with kernel version 4.9 or above.

Test: hikey boot and bpf program show up under sys/fs/bpf
Bug: 30950746
Change-Id: I3d14d270a04ea57319ad4292ff51b1cf933fc975
2018-02-09 15:17:22 -08:00
Michael Wright
0b733a2036 Merge "Revert "Correct some GSI settings to board makefile"" 2018-02-07 15:11:07 +00:00
Michael Wright
87163300c2 Revert "Correct some GSI settings to board makefile"
This reverts commit 6e96487968.

Reason for revert: build_test broken by this change.

Change-Id: I0f48bb84dc8c521540c745814daa11c2900ac2c8
2018-02-07 12:08:51 +00:00
Treehugger Robot
2f7f7ca1c0 Merge "Correct some GSI settings to board makefile" 2018-02-07 09:02:40 +00:00