Commit Graph

43659 Commits

Author SHA1 Message Date
Yohei Yukawa 2cf2700175 Stop pre-installing OpenWnn by default
Bug: 78292367
Test: Manually verified taht OpenWnn is no longer pre-installed
Change-Id: I8463f5519d9ea8179027d3b4639821e96fec32b9
2018-04-19 17:25:50 -07:00
TreeHugger Robot 81a492c7e8 Merge "Make aosp_$arch system images closer to GSIs" into pi-dev 2018-04-19 00:26:17 +00:00
Colin Cross c051048ba7 Pass PLATFORM_VERSION_CODENAME to Soong
Pass PLATFORM_VERSION_CODENAME as Platform_sdk_codename, and
set Platform_sdk_final if PLATFORM_VERSION_CODENAME is REL.

Bug: 78224641
Test: m checkbuild
Change-Id: Ic082ca756d877ba51f45e89aa2ac267781a8d854
Merged-In: Ic082ca756d877ba51f45e89aa2ac267781a8d854
(cherry picked from commit f6d3fff907)
2018-04-18 12:42:46 -07:00
Isaac Chen 164eed2e7d 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
2018-04-18 18:28:41 +08:00
TreeHugger Robot 62e48ce1a4 Merge "Update security string to 2018-05-05 on pi-dev Bug: 74345861" into pi-dev 2018-04-17 20:09:20 +00:00
Dan Willemsen 52e14a617d Merge "Add variables for configuring Soong plugins" into pi-dev 2018-04-17 19:35:35 +00: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
Andrew Hsieh 0dd11dc0b5 Merge "Enable vndk_package if BOARD_VNDK_VERSION is set" into pi-dev 2018-04-16 23:12:19 +00:00
Andrew Hsieh 30791d858f Merge "Update current.txt to add libminijail.so" into pi-dev 2018-04-16 22:54:58 +00: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 03b6fa6a64 Merge "Freeze VNDK list for finalizing P SDK" into pi-dev 2018-04-13 20:53:03 +00:00
Wale Ogunwale 5de065e3ec Merge "Finalizing P SDK" into pi-dev 2018-04-13 20:53:03 +00:00
TreeHugger Robot 08afb09c5c Merge "Adds SecureElement apk to core.mk" into pi-dev 2018-04-13 20:30:26 +00:00
Wale Ogunwale 07a54b7fba Finalizing P SDK
Bug: 77588754
Test: builds
Merged-In: Iebb43a246016774150a3053f10bdedb0278b3e5d
Change-Id: Ied2e381795643aaf8c48e6c89d8ee66b8b5b15ed
2018-04-13 14:59:03 +00: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
Isaac Chen 5364f5a298 Enable vndk_package if BOARD_VNDK_VERSION is set
This is a first attempt to enable build system support to include
vndk_package automatically (if BOARD_VNDK_VERSION is set), so devices
don't need to add it via PRODUCT_PACKAGE manually.

Bug: b/67002788
Test: Booted on the x86 emulator and a physical device and checked
      their /system/lib*/vndk-* directories for vndk_package libraries.
    # The commands below are for the x86 emulator:
    $ lunch aosp_x86_64-userdebug; m -j
Change-Id: Iea927b9535c7ee1b64ca130a4ac54f0fd8b3f758
2018-04-13 15:33:44 +08: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
Logan Chien c188bb8828 Merge "Move logwrapper to shell_and_utilities." into pi-dev 2018-04-13 00:56:38 +00:00
Jiyong Park 0fa0052583 Allow native:vendor to vendor apks
Vendor apks should be able to reference native vendor libraries.
Vendor apks have worked around this by building without
LOCAL_SDK_VERSION, which then allowed to use all libs. However,
since vendor apks now needs to be built with SystemSDK, that
workaround can no longer be used.

Bug: 76398918
Test: BOARD_SYSTEMSDK_VERSION=P m -j
Merged-In: Idb13d5db71f4dfd542658483b6a24e7ece18ce26
Change-Id: Idb13d5db71f4dfd542658483b6a24e7ece18ce26
(cherry picked from commit 49a5b9785f)
2018-04-13 07:50:31 +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
Adam Seaton 8108edbc87 Update security string to 2018-05-05 on pi-dev
Bug: 74345861
2018-04-12 11:56:29 -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
Dan Willemsen 79657520ee Add variables for configuring Soong plugins
See the Soong commit for detailed usage.

Bug: 76168832
Test: define some variables, use them
Change-Id: Ia8af5b6ec1cb3f12cbc1fee582a309eebb340b7c
Merged-In: Ia8af5b6ec1cb3f12cbc1fee582a309eebb340b7c
(cherry picked from commit eaacf5b285)
2018-04-11 15:31:35 -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
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
Bo Hu c1761dab74 Merge "emulator: use puresoftware keymaster" into pi-dev 2018-04-11 01:55:02 +00: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
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
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 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
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
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
Tom Cherry 1355c4603c Convert liboemaids to oemaids_headers as a headers only library
Bug: 77298768
Test: test that config.fs AIDs are visible through this library
Change-Id: Ifbf3276212ea6904533ac23021bfce29d9a3c5d9
(cherry picked from commit 7a95c15c15)
2018-04-04 16:05:49 -07:00
Ryan Prichard d809d369cb Fix mini_debug_info stripping when no symbols should be kept.
If there are no symbols to keep (i.e. all function symbols are also in
the dynsym table), then the $@.keep_symbols file has size 0.
When objcopy parses a --keep-symbols file, it has a special case for
0-sized files where it silently fails (exits with status 1, no error
message). On the other hand, objcopy is happy with a file containing no
symbols, as long as there is some whitespace or a comment. Avoid the
special case by appending a newline to keep_symbols.

Bug: b/62815515
Bug: b/77242617
Test: manual
Change-Id: I348593164fe78ece5c85db3d28c7daccce3a52fb
(cherry picked from commit a45f5833c0)
2018-04-04 15:56:20 -07:00
Ben Fennema 86702c24f4 Fix: Conditionally remove atb from bootclasspath for core_tiny.xml
Seems to be a cut-and-paste error in ag/3520851
base and core_minimal use REMOVE_ATB_FROM_BCP,
core_tiny used REMOVE_OAHL_FROM_BCP
(cut and pasted from the section above for
framework-oahl-backward-compatibility)

Bug: 74074575
Bug: 30188076
Test: no more of the following on wear:
  Unable to open boot classpath entry: /system/framework/framework-atb-backward-compatibility.jar
Signed-off-by: Ben Fennema <fennema@google.com>

Change-Id: I25327705ff37ab3d077b3917fcca096c398eb3ee
2018-04-03 21:32:01 -07:00
bohu 49664b3c70 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
Merged-In: Ifd8639ac4cb883402c90de45b15b11077a60fa5f
(cherry picked from commit acc16846e3)
2018-04-03 15:23:19 +08:00
TreeHugger Robot 001bc1ee00 Merge "Add components to enable CFI for." into pi-dev 2018-04-03 02:06:22 +00:00
Vishwath Mohan d2c372c086 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
Merged-In: I56b6dfd5495639974a19623bc7aea9efeb9acff6
2018-04-02 17:12:20 -07:00
Tri Vo 614e2411b3 Add TOT_SEPOLICY_VERSION = 10000.0
This variable is equal to the sepolicy version for tip-of-tree development.

Bug: 74622750
Test: ./build/soong/soong_ui.bash  --dumpvars-mode -vars PLATFORM_SEPOLICY_VERSION
is unchanged.
Change-Id: I2a62f7399fe245ec0c681e9a789da6b1b83dd9d8
Merged-In: I2a62f7399fe245ec0c681e9a789da6b1b83dd9d8
(cherry picked from commit d9c8e956ac)
2018-04-02 13:44:27 -07:00
Calin Juravle c6063bf93c Merge "Revert "Change the default compiler filter for install to speed-profile"" into pi-dev 2018-03-31 00:28:40 +00:00
TreeHugger Robot 3e1786112f Merge "Allow platform modules to link to vendor public libraries" into pi-dev 2018-03-31 00:24:16 +00:00
Calin Juravle 4fcf794170 Revert "Change the default compiler filter for install to speed-profile"
This reverts commit 0edf9aebea.

Reason for revert: it breaks JVMTI CTS tests (because of app images).

Bug: 77340429
Bug: 77321621
Change-Id: I4236ecd42c92f9a594f94cf212f0a75945989ad9
2018-03-31 00:14:04 +00:00