Commit Graph

2722 Commits

Author SHA1 Message Date
Tobias Thierer 0d35b9fba3 Merge "Revert "Build support for 32-bit armv8-a""
am: 1da1c6d056

Change-Id: I7a5ae22c984ffe8781998b5ae8e20aeb7516fac1
2017-08-22 10:36:35 +00:00
Tobias Thierer 1da1c6d056 Merge "Revert "Build support for 32-bit armv8-a"" 2017-08-22 10:30:29 +00:00
Tobias Thierer 7de79cbeaf Revert "Build support for 32-bit armv8-a"
This reverts commit 0daa78eef4.

Reason for revert: Broke the build for some targets (including marlin and angler).

$ make cts
build/core/combo/TARGET_linux-arm.mk:43: kryo is armv8-a.
build/core/combo/TARGET_linux-arm.mk:45: TARGET_2ND_ARCH_VARIANT, armv7-a-neon, ignored! Use armv8-a instead.
[...]
cts/tests/tests/os/jni/android_os_cts_CpuInstructions.cpp:88:20: error: instruction requires: armv7 or earlier
    asm volatile ( "swp r0, r0, [%0]" : "+r"(ptr) : : "r0" );
                   ^
<inline asm>:1:2: note: instantiated into assembly here
        swp r0, r0, [r1]
        ^

Change-Id: I65a91ed5a4461eca6646df13642a87a5c37d6c85
2017-08-21 15:03:16 +00:00
Isaac Chen ef1e443e14 Merge "Build support for 32-bit armv8-a"
am: 70fe80491c

Change-Id: I6b4291a893ff42eca1933b8783e342855f22917f
2017-08-19 06:16:49 +00:00
Isaac Chen 70fe80491c Merge "Build support for 32-bit armv8-a" 2017-08-19 06:10:56 +00:00
Nicolas Geoffray 30f7a02a7a Merge "Add com.android.location.provider to the system server classpath."
am: 24678e9469

Change-Id: I0ca70630d4a607feead6ab9c1feddc878e40f698
2017-08-15 07:40:39 +00:00
Nicolas Geoffray 24678e9469 Merge "Add com.android.location.provider to the system server classpath." 2017-08-15 07:32:10 +00:00
Jiyong Park 347310c363 Merge "Phony module vndk_package is added"
am: cb674cf05d

Change-Id: I9337748d3bcdb9489f0573214dbf3e9e9fe8cd9b
2017-08-11 02:17:42 +00:00
Nicolas Geoffray ec5e04096b Add com.android.location.provider to the system server classpath.
bug: 64571709
Test: com.android.location.provider is speed compiled in /system
Change-Id: I64c5d5257cffb9bc8481bd4fb78a65cb08ac993a
2017-08-10 20:30:48 +01:00
Isaac Chen 0daa78eef4 Build support for 32-bit armv8-a
Overwrite TARGET_(2ND_)ARCH_VARIANT as armv8-a if
TARGET_(2ND_)CPU_VARIANT is set to some known armv8-a core like
cortex-a53, cortex-a73, kryo, denver64 etc.

For clang, -march is ignored if -mcpu is set to specific core so this
change doen't impact the objects built for armv7-a-neon/some_armv8_core
since it's treated as armv8-a/some_armv8_core.

Bug: 62895439
Test: Built modified aosp_arm64 with armv8-a as its TARGET_2ND_CPU_ARCH
      and generic as its TARGET_2ND_CPU_VARIANT successfully.
      "lunch hikey-userdebug; make" and verify TARGET_2ND_ARCH_VARIANT
      is overwritten.

Change-Id: If4260cf397783b5f56c4fd432615f4676429a1d3
2017-08-10 16:13:22 +08:00
Jiyong Park a5535733f1 Phony module vndk_package is added
This phony module aggregates all the VNDK-related libraries so that they
can be installed to the system partition simply by adding 'vndk_package'
to PRODUCT_PACKAGES. This is to sneure that all VNDK libraries are
installed even when there is no vendor library using some of the VNDK
libs (especially when building system image only).

Bug: 64013660
Test: BOARD_VNDK_VERSION=current m -j vndk_package
Merged-In: I3a14a7eaaffd6a7f3258a4be59b1c5813153714d
Change-Id: I3a14a7eaaffd6a7f3258a4be59b1c5813153714d
2017-08-10 14:15:01 +09:00
Mark Salyzyn 1830c9596d Merge "logcat: permit transition to Android.bp"
am: 374f753211

Change-Id: Ieeee905248faea638ed18831ba2168f2914f7d02
2017-08-08 23:10:03 +00:00
Treehugger Robot 374f753211 Merge "logcat: permit transition to Android.bp" 2017-08-08 23:06:25 +00:00
Mark Salyzyn 719790f4d4 logcat: permit transition to Android.bp
Permit transition of logcat to Android.bp by moving the debug
target logpersist.start to the PRODUCT_PACKAGES_DEBUG list.

Test: compile
Change-Id: I6cfd4c40f848a2ff2661e3692fa8cd69ed99e8c9
2017-08-08 14:24:55 -07:00
Jeff Gaston 03e7e81837 Merge "Remove the need to find Android.mk files via directory symlinks"
am: 6ab53d7211

Change-Id: I0495d45001821d095531d5be7c049fc2836888f7
2017-08-08 00:14:51 +00:00
Jeff Gaston 6ab53d7211 Merge "Remove the need to find Android.mk files via directory symlinks" 2017-08-08 00:05:09 +00:00
Jeff Gaston 5c1f3fd068 Remove the need to find Android.mk files via directory symlinks
Bug: 64397960
Test: m -j
Change-Id: I5b77dd654dfced63900913c447b5448b632158d7
2017-08-07 14:21:20 -07:00
Jeff Hao 3b16c4e7c7 Merge "Add dirty-images-objects handling to boot image build."
am: 5848fedea8

Change-Id: Ida5683c28ed78db625a5383f52b81a087373ea75
2017-08-05 01:02:18 +00:00
Jeff Hao b454ee195a Add dirty-images-objects handling to boot image build.
Allows grouping of classes with dirty static fields to be grouped
together in the image to have fewer dirty pages.

(cherry-picked from commit 865d54caf2)

Bug: 62554875
Test: mm test-art-host

Merged-In: I2486d2704d74a192f1ecdc02589e569b61efa4ae
Change-Id: I2486d2704d74a192f1ecdc02589e569b61efa4ae
2017-08-03 11:04:11 -07:00
Bo Hu abd33cdba6 Merge "Revert "Revert "emulator: create qemu images for system,vendor"""
am: 5af2027e34

Change-Id: I61b9598d6b69d74a42ad0dc445c866e3034ff638
2017-08-01 23:22:17 +00:00
Bo Hu f0d50bbef0 Revert "Revert "emulator: create qemu images for system,vendor""
This reverts commit 9b99ddc8a5.
and add syste-qemu.img to the dependency list of sdk target

Test: build sdk target successfully

Change-Id: Idb0bee56275f3bfe33ba7d29463e4b8e0699ec33
2017-08-01 13:00:53 -07:00
Bo Hu b7e5cf8b6d Merge "Revert "emulator: create qemu images for system,vendor""
am: a2ea9626e5

Change-Id: I0118d5355aa3ffcd728b22e964609f02561df2db
2017-08-01 07:00:06 +00:00
Bo Hu 9b99ddc8a5 Revert "emulator: create qemu images for system,vendor"
This reverts commit b5d0503758.

Change-Id: Ie46a3a3dd99dec42673b3e3bd5b9085ca0480a8d
2017-08-01 06:50:07 +00:00
bohu dbbd3311ae Merge "emulator: create qemu images for system,vendor"
am: 571e5d47b7

Change-Id: Id80d452017384769146879bec205f39da79e37ae
2017-08-01 01:56:12 +00:00
bohu b5d0503758 emulator: create qemu images for system,vendor
For raw system.img and vendor.img do not have
partition table and init refuses to mount them
in first stage mounting.

For emulator build:
create partitioned system-qemu.img for system.img;
create partitioned vendor-qemu.img for vendor.img
if applicable.

Change-Id: I64fdcdafc303cf2f74a1e96653e7afe259f0af98
2017-07-31 16:28:40 -07:00
Jeff Vander Stoep 9a8f6775ec sepolicy: remove all use of domain_deprecated
This attribute has been removed from public policy and is no longer
available.

Bug: 38316109
Test: build policy
Change-Id: I3407ced2d725de982e19b77345827de03d93c426
(cherry picked from commit ec488e1fee)
2017-07-24 08:17:39 -07:00
Suren Baghdasaryan 81a7690eb9 Add makefile to define PRODUCT_SHIPPING_API_LEVEL for O release
For Android O release PRODUCT_SHIPPING_API_LEVEL is set to 26.

Change-Id: Ie1d5af375f2db95850fc5395d6a0c775dbfa046d
Merged-In: Ie1d5af375f2db95850fc5395d6a0c775dbfa046d
(cherry picked from commit f3251ac73b)
2017-07-19 19:52:20 +00:00
Andreas Gampe 205958cb38 Merge "Build: More tombstones in userdebug"
am: 5378d0a7eb

Change-Id: I414a28b22f8677099ab61812995ca6715f8f2563
2017-07-07 15:23:48 +00:00
Andreas Gampe 427e49e0da Build: More tombstones in userdebug
For devices using core_minimal, set the number of retained
tombstones in userdebug and eng builds to 50. This will help
with dogfooding.

(cherry picked from commit 47e137f357)

Bug: 63131375
Test: lunch bullhead_userdebug && m && fastboot flashall && adb getprop tombstoned.max_tombstone_count
Change-Id: I163d40f7a8f73df1af1228309d7a7a95511bdef9
2017-07-06 23:54:14 -07:00
Huan Ren 874ee28b68 Merge "Add android.hardware.power service+impl and power.ranchu" into oc-dev
am: 76946c6ab6

Change-Id: I2a87da8ab334e8fa7a2076677dc27bc75a09dbff
2017-06-23 19:43:01 +00:00
Huan Ren 76946c6ab6 Merge "Add android.hardware.power service+impl and power.ranchu" into oc-dev 2017-06-23 18:33:16 +00:00
Andreas Gampe ac1a012d21 Merge "Build: Use ART phony packages in runtime_libart" am: 47b734db57
am: 2d3b1ca45a

Change-Id: I28d9d8369f374e7b20461a4e931e70aafe3a10eb
2017-06-23 02:01:57 +00:00
Andreas Gampe ae4916b0ad Build: Use ART phony packages in runtime_libart
Move definition of necessary packages for ART to art/Android.mk.
Use the phony packages defined there in runtime_libart.mk.

Bug: 62087184
Test: m
Test: Device boots
Change-Id: Iae6e5bba2184b098820783dc5e9f6b5f2a9836e9
2017-06-22 15:35:14 -07:00
SzuWei Lin ef8e26b220 Add audio.a2dp.default to generic system image
am: fbac1195e9

Change-Id: I0a5f13ec32cfac2caa5dbb8e979fb0dffa54be5e
2017-06-21 02:48:32 +00:00
SzuWei Lin fbac1195e9 Add audio.a2dp.default to generic system image
audio.a2dp.default is a system module. Generic system image includes
audio.a2dp.default to support A2DP if board has the capability.

Bug: 62649731
Test: build and check the file existance in system image
Merged-In: Iac4821b3daf993da9fc309b7b105db98ee4b89ce
Change-Id: I0d2194c4145927b21df5858a3787f8c210f2794c
(cherry picked from commit fe3191727b)
2017-06-20 17:54:07 +08:00
Igor Murashkin cda3d10e56 core: Move core.oat bootjar definitions into envsetup.mk
TARGET_CORE_JARS and HOST_CORE_JARS define the minimal bootclasspath jars necessary to run
with dalvikvm/art.

Also refactor PRODUCT_BOOT_JARS in core-tiny.mk and core-minimal.mk to reuse TARGET_CORE_JARS.
The above variables can be used from scripts with get_build_var from envsetup.sh

  $> get_build_var TARGET_CORE_JARS
  <prints list of core jars>

(These changes are required to figure out what --bootclasspath_entry to pass to desugar).

Bug: 36902714
Test: make -j32 build-art-host build-art-target
Test: lunch aosp_angler-userdebug && make -j32
Test: make -j32 PRODUCT-sdk_google_aw_x86-sdk
Change-Id: If12569719343bfbba20c1cda9a5302ab541dbfc6
(cherry picked from commit f33a96c07f)
2017-06-16 03:08:33 +00:00
Treehugger Robot 6cb7688e85 Merge "core: Move core.oat bootjar definitions into envsetup.mk" 2017-06-16 02:06:02 +00:00
Igor Murashkin 9d4639c8c2 core: Move core.oat bootjar definitions into envsetup.mk
TARGET_CORE_JARS and HOST_CORE_JARS define the minimal
bootclasspath jars necessary to run with dalvikvm/art.

Also refactor PRODUCT_BOOT_JARS in core-tiny.mk and core-minimal.mk
to reuse TARGET_CORE_JARS.

The above variables can be used from scripts with get_build_var
from envsetup.sh

  $> get_build_var TARGET_CORE_JARS
  <prints list of core jars>

(These changes are required to figure out what --bootclasspath_entry
to pass to desugar).

Bug: 36902714
Test: make -j32 build-art-host build-art-target
Test: lunch aosp_angler-userdebug && make -j32
Test: make -j32 PRODUCT-sdk_google_aw_x86-sdk
Merged-In: If12569719343bfbba20c1cda9a5302ab541dbfc6
Change-Id: If12569719343bfbba20c1cda9a5302ab541dbfc6
2017-06-16 00:54:47 +00:00
Lingfeng Yang d2fc242c34 Add android.hardware.power service+impl and power.ranchu
Bug: 37302997
Bug: 37863919

Change-Id: Ifc79b3498c48cf4b8ff5db433064a3bf9edc041b
(cherry picked from commit bc02d4274fde079d97fe18f5a0974a20757f3827)
2017-06-15 18:13:14 +00:00
Nicolas Geoffray 0081d76597 Merge "Add a new PRODUCT variable for forcing 'speed' preopt." into oc-dev 2017-06-15 14:06:10 +00:00
Nicolas Geoffray 59514d2bae Merge "Add a new PRODUCT variable for forcing 'speed' preopt." am: 8c2c1ed667
am: eec5747912

Change-Id: Iee5490ea2b74137612238282115478b148aed55e
2017-06-15 11:48:26 +00:00
Nicolas Geoffray c3ffeddc59 Add a new PRODUCT variable for forcing 'speed' preopt.
bug: 35872915
Test: build

(cherry picked from commit 4a0ad4ac61)

Change-Id: Idfea3c379a2b1dab30ee94a58ffe86d508f8522f
2017-06-15 12:40:15 +01:00
Nicolas Geoffray 8c2c1ed667 Merge "Add a new PRODUCT variable for forcing 'speed' preopt." 2017-06-15 11:38:24 +00:00
Mariano Giardina 78d9b75329 Merge "Revert "core: Move core.oat bootjar definitions into core/config"" am: 1e14bc3b7b
am: cc33b6005f

Change-Id: I2f7465d6bd723c85aa0c028e8e8268d631c13d02
2017-06-15 11:12:23 +00:00
Mariano Giardina 1e14bc3b7b Merge "Revert "core: Move core.oat bootjar definitions into core/config"" 2017-06-15 11:01:29 +00:00
Mariano Giardina 2f137ee118 Revert "core: Move core.oat bootjar definitions into core/config"
This reverts commit 8c50798243.

Possible culprit of breakage in git_master sdk_google_aw_x86:
FAILED: out/target/product/generic_x86/dex_bootjars/system/framework/x86/boot.art 
ex2oatd E 06-15 03:56:00 47990 47990 runtime.cc:1761] Failed to return pre-allocated NoClassDefFoundError
dex2oatd F 06-15 03:56:00 47990 47990 thread.cc:3591] Check failed: new_exception != nullptr 

Testing if Treehugger passes with the rollback before submitting

https://android-build.googleplex.com/builds/submitted/4101897/sdk_google_aw_x86-sdk/latest/view/logs/build_error.log

Change-Id: Iceac31e775eaf3cd5fd9b3d2a17d3af200e35b27
2017-06-15 10:14:51 +00:00
Nicolas Geoffray 4a0ad4ac61 Add a new PRODUCT variable for forcing 'speed' preopt.
bug: 35872915
Test: build
Change-Id: Idfea3c379a2b1dab30ee94a58ffe86d508f8522f
2017-06-15 09:52:45 +01:00
Igor Murashkin 9c57325093 Merge "core: Move core.oat bootjar definitions into core/config" am: 5e1aa20225
am: db52463bb3

Change-Id: I7fe90df0a8dae2fb5aa9f0dbcfc21a77b2700a87
2017-06-15 03:16:07 +00:00
Igor Murashkin 5e1aa20225 Merge "core: Move core.oat bootjar definitions into core/config" 2017-06-15 03:06:12 +00:00
Igor Murashkin 8c50798243 core: Move core.oat bootjar definitions into core/config
TARGET_CORE_JARS and HOST_CORE_JARS define the minimal
bootclasspath jars necessary to run with dalvikvm/art.

Also refactor PRODUCT_BOOT_JARS to reuse TARGET_CORE_JARS.

(These changes are required to figure out what --bootclasspath_entry
to pass to desugar).

Bug: 36902714
Test: make -j32 && make -j32 build-art-host build-art-target
Change-Id: I620e28be41047a1d501d7f144fe415ee4a0af36f
2017-06-14 10:02:09 -07:00