Commit graph

2928 commits

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

Change-Id: If2462f36e946ac62143ae52d0952f2bfc74f2115
2017-08-22 10:54:38 +00:00
Tobias Thierer
bc9829fb3f Merge "Revert "Build support for 32-bit armv8-a"" am: 1da1c6d056 am: 0d35b9fba3
am: ff4ba02d5b

Change-Id: I1d112aad1ebb715fa4990db53ed1347a9e8bf11c
2017-08-22 10:48:44 +00:00
Tobias Thierer
ff4ba02d5b Merge "Revert "Build support for 32-bit armv8-a"" am: 1da1c6d056
am: 0d35b9fba3

Change-Id: Id2ed78457ec3014812326ee34895bf705c741052
2017-08-22 10:42:35 +00:00
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
Bowgo Tsai
1f5e66c205 Merge "GSI: adds /odm mount point in root dir" into oc-mr1-dev
am: 76097d33b2

Change-Id: I9316c9cdacafb85920cb7a1ceff64c3cff27e37f
2017-08-21 01:43:23 +00:00
TreeHugger Robot
76097d33b2 Merge "GSI: adds /odm mount point in root dir" into oc-mr1-dev 2017-08-21 01:39:05 +00:00
Bowgo Tsai
2e2f6f2b75 Merge "64-bit GSI: adds init.zygote32_64.rc into root dir for vendor to select" into oc-mr1-dev
am: 35f997178a

Change-Id: I79f490a2ec637c5a60a8d019ab8e273a88a897b2
2017-08-20 05:21:39 +00:00
Isaac Chen
d9609dd5f1 Merge "Build support for 32-bit armv8-a" am: 70fe80491c am: ef1e443e14 am: 43b2504cd2
am: e5dd3915f7

Change-Id: Ib9ddb35eee30e8024b92515873b904cd0e30d89a
2017-08-19 06:25:45 +00:00
Isaac Chen
e5dd3915f7 Merge "Build support for 32-bit armv8-a" am: 70fe80491c am: ef1e443e14
am: 43b2504cd2

Change-Id: Ib2d66b827d2562dfc247fc97dc89baa960f735bf
2017-08-19 06:23:14 +00:00
Isaac Chen
43b2504cd2 Merge "Build support for 32-bit armv8-a" am: 70fe80491c
am: ef1e443e14

Change-Id: I4086a8e63dbda784686fd42fedd38dedbbac8771
2017-08-19 06:19:44 +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
Bowgo Tsai
882c99a33b GSI: adds /odm mount point in root dir
Bug: 64700195
Test: boot A/B device with /odm
Change-Id: Ie014a052a333b2cb8d89bc43e4326be81e638dcd
2017-08-18 16:18:35 +08:00
Bowgo Tsai
cccd0b2a30 64-bit GSI: adds init.zygote32_64.rc into root dir for vendor to select
For 64-bit GSI, there are two different zygote settings:
  1. 64-bit primary, 32-bit secondary (init.zygote64_32.rc) OR
  2. 32-bit primary, 64-bit secondary (init.zygote32_64.rc)
  3. 64-bit only is currently forbidden (b/64280459#comment6)

This change adds the second setting into root dir for vendor.img to
select. The first setting already exists.

PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.zygote=zygote64_32 is removed
because the property will be put into vendor.img. i.e., it has no effect
on GSI.

Bug: 64280459
Test: build and boot device, checks init.zygote32_64.rc is in rootdir
Change-Id: I16b36018acac8cfeee7281d6f4b6c9c19467abec
2017-08-18 11:29:45 +08:00
SzuWei Lin
414d7c6ee2 Merge "Apply vndk_package to generic system image" into oc-mr1-dev
am: e6262be0d6

Change-Id: I0eecc4fe85dce729a8e9cc5d72066d4cb41f5543
2017-08-17 10:02:19 +00:00
SzuWei Lin
3cbe82df5f Apply vndk_package to generic system image
Add vndk_package into PRODUCT_PACKAGES, which includes
HAL interfaces, VNDK, VNDK-SP and LL-NDK.

vndk_package increases the total size of GSI content, so
changes the system partition size of:

* 64 bits projects to 1.5GB
* 32 bits projects to 1.0GB

Bug: 64654641
Test: build all GSI projects
Change-Id: I3c66c966eceebd63ee19f6a3de778beed0be6de5
2017-08-17 15:12:53 +08:00
SzuWei Lin
df8310bfb6 Merge "Move common 32/64 bits product settings to another files" into oc-mr1-dev
am: 1f8b6033cb

Change-Id: Ie4b0c5055e4a221c2cc1c087ca25920b3026c47f
2017-08-15 17:20:30 +00:00
TreeHugger Robot
1f8b6033cb Merge "Move common 32/64 bits product settings to another files" into oc-mr1-dev 2017-08-15 16:53:08 +00:00
TreeHugger Robot
d215d9038b Merge "Add com.android.location.provider to the system server classpath." into oc-mr1-dev 2017-08-15 10:10:24 +00:00
Nicolas Geoffray
da7c0efec1 Merge "Add com.android.location.provider to the system server classpath." am: 24678e9469 am: 30f7a02a7a am: 1fe6892e19
am: db18b88c15

Change-Id: Icba118331fd26b92edaa373d2fd7a99e5eed0b09
2017-08-15 07:54:56 +00:00
Nicolas Geoffray
db18b88c15 Merge "Add com.android.location.provider to the system server classpath." am: 24678e9469 am: 30f7a02a7a
am: 1fe6892e19

Change-Id: I6666568d1078d0d7dd9fb298dd9bf9c2911062d5
2017-08-15 07:50:55 +00:00
Nicolas Geoffray
1fe6892e19 Merge "Add com.android.location.provider to the system server classpath." am: 24678e9469
am: 30f7a02a7a

Change-Id: Ibdcba33ba9bd46f08e6c1e4410acea8bc68db61b
2017-08-15 07:44:55 +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
963485ecf7 Add com.android.location.provider to the system server classpath.
bug: 64571709
Test: com.android.location.provider is speed compiled in /system

(cherry picked from commit ec5e04096b)

Change-Id: I179872125af89101bee7493f24687518cb39a0db
2017-08-15 08:33:09 +01:00
Nicolas Geoffray
24678e9469 Merge "Add com.android.location.provider to the system server classpath." 2017-08-15 07:32:10 +00:00
SzuWei Lin
2456b82419 Merge "Reduce the system partition size of generic system images" into oc-mr1-dev
am: b5b4829c45

Change-Id: Ie29f004b118bf2aa6f74b922b72ce3e65d364603
2017-08-15 01:02:00 +00:00
TreeHugger Robot
b5b4829c45 Merge "Reduce the system partition size of generic system images" into oc-mr1-dev 2017-08-15 00:49:50 +00:00
Bo Hu
22221a4f5a Merge changes from topic "port-emu-to-oc-mr1-dev" into oc-mr1-dev
am: 60df0a831c

Change-Id: I6b3976e5f96324ffa9474cd84ff94f278a9dde33
2017-08-14 18:49:42 +00:00
bohu
e81be42996 emulator: move rild.libpath to vendor
am: cb694ebb34

Change-Id: I77aea16d2e85e94d89354352a26a1695b736bb00
2017-08-14 18:49:28 +00:00
bohu
ebc7dc21b8 sdk:enable emulator to launch in build environment
am: f2e71a4353

Change-Id: Id11fb442a1df7ae2e2f7eb5685101f6e5c9d6a2b
2017-08-14 18:49:08 +00:00
bohu
54416a0d53 build-emulator: fully treblize emulator image
am: d5f90a52e7

Change-Id: I547f67c8aed8b98116451838779453c4b0304124
2017-08-14 18:48:58 +00:00
Yahan Zhou
5a4f08b459 Build vendor image for emulator
am: c61b6bd2ed

Change-Id: Ieaa190c1bd9a356f39fa72ba5cd37570d6bba233
2017-08-14 18:48:45 +00:00
Bo Hu
60df0a831c Merge changes from topic "port-emu-to-oc-mr1-dev" into oc-mr1-dev
* changes:
  emulator: squash misc modifications from oc-emu-dev
  emualtor: keep libopenjdkjvmti*.so on sdk images
  emulator: move rild.libpath to vendor
  sdk:enable emulator to launch in build environment
  build-emulator: fully treblize emulator image
  Build vendor image for emulator
2017-08-14 18:34:57 +00:00
Mathieu Chartier
92c48b9da3 Merge "Update paths for frameworks/base/config" into oc-mr1-dev
am: 3a1776a777

Change-Id: I98219d3e398c26be485887fa914060ed8f682ea2
2017-08-14 16:58:38 +00:00
Mathieu Chartier
3a1776a777 Merge "Update paths for frameworks/base/config" into oc-mr1-dev 2017-08-14 16:53:06 +00:00
SzuWei Lin
2999f29ea0 Move common 32/64 bits product settings to another files
Move the common 32/64 bits product settings from aosp_xxx.mk to

    target/product/treble_common_(32|64).mk

The original core_64_bit.mk is not match the GSI requirement,
and will be revised soon. So, clone the content of
core_64_bit.mk into treble_common_64.mk.

Bug: 64653300
Test: Build pass
Change-Id: I6154a5c4927287c703a874b5cbf6a7f0c2c3594c
2017-08-14 18:09:49 +08:00
bohu
753e9e4462 emulator: squash misc modifications from oc-emu-dev
Change-Id: I7380292cd4dc851a987683bdf61d511dbf74aff6
2017-08-13 22:32:01 -07:00
bohu
cb694ebb34 emulator: move rild.libpath to vendor
BUG: 62137708
Test: buld sdk_gphone_x86-user, launch
emulator make sure radio works

Change-Id: I4ef1483a8d95a74b54deb6f0d4b2461c733c8140
2017-08-13 22:31:45 -07:00
bohu
f2e71a4353 sdk:enable emulator to launch in build environment
Recent changes in emulator requires advancedFeatures.ini,
encryptionkey.img and new kernels (such as 3.18) at OUT directory
so emulator can find them.

This CL set those up as part of the build process.

Change-Id: Ib3b7c4c48a22cecb44255e643402fd1c37797522
2017-08-13 22:31:36 -07:00
bohu
d5f90a52e7 build-emulator: fully treblize emulator image
Install emulator specific binaries and libraries
to vendor partition; update selinux; add vndk.

BUG: 37511975

Test: build user build, launch emualtor, run CTS.

Change-Id: I70f58947e98b41b195d77b4347d2efdc09348392
2017-08-13 22:31:22 -07:00
Yahan Zhou
c61b6bd2ed Build vendor image for emulator
BUG: 37511975

Test: lunch sdk_gphone_x86-user, make with dist option, unzip
sdk_gphone_x86-emulator-eng.xxxx.zip to system image folder, emulator
can boot

Change-Id: I75b9f0de17fece3dec5ae1662400808af321bd4d
2017-08-13 22:28:58 -07:00
Bowgo Tsai
799f1cfcf3 Merge "treble_common.mk: add the vbmeta.img to disable verification" into oc-mr1-dev
am: 025d5d910b

Change-Id: Ib9680f060e7024d566f4b0c822a05ee19b8178df
2017-08-12 04:05:36 +00:00
TreeHugger Robot
025d5d910b Merge "treble_common.mk: add the vbmeta.img to disable verification" into oc-mr1-dev 2017-08-12 04:00:18 +00:00
Mathieu Chartier
37ba2d97df Update paths for frameworks/base/config
Bug: 64259751
Test: make
Change-Id: Ie159ef9f3f96d7ecd22429327a64161bd63f525b
2017-08-11 14:45:05 -07:00
Mathieu Chartier
4f3bce897b Merge "Add dirty-images-objects handling to boot image build." into oc-mr1-dev 2017-08-11 16:32:26 +00:00
Jiyong Park
4d19874e9c Merge "Phony module vndk_package is added" am: cb674cf05d am: 347310c363
am: c674a24562

Change-Id: Ie6da1725fdadce3ac1f64c4c4558e9bc0a5666d1
2017-08-11 02:26:21 +00:00
SzuWei Lin
d52d6eb333 Merge "Move common settings in BoardConfig.mk into a common makefile" into oc-mr1-dev
am: 1f6869381f

Change-Id: I34be78f55f6b567c4c9d6760cddaaa72b2b8e81a
2017-08-11 02:26:06 +00:00
Jiyong Park
c674a24562 Merge "Phony module vndk_package is added" am: cb674cf05d
am: 347310c363

Change-Id: I3915ef9a7600a91e890111b5718b783225e208f3
2017-08-11 02:22:12 +00:00