Commit Graph

2854 Commits

Author SHA1 Message Date
Steve Muckle dff8364c97 Merge "get kernel configs from kernel/configs" am: b4a3124822
am: 634ab481da

Change-Id: I89c19207e4a8792f38891e9dd88b7fcc160f6efe
2017-09-13 21:20:27 +00:00
Steve Muckle 634ab481da Merge "get kernel configs from kernel/configs"
am: b4a3124822

Change-Id: Ib6a306a7bf4725e4030893bdb24d2de394fb38be
2017-09-13 21:08:28 +00:00
Steve Muckle b4a3124822 Merge "get kernel configs from kernel/configs" 2017-09-13 19:33:19 +00:00
Steve Muckle 378c2bb42a get kernel configs from kernel/configs
The kernel configs have moved out of VTS and into their own
repository.

Test: build and boot
Change-Id: I649af63216e7b18604586f70396bceff626c30d0
2017-09-12 16:26:28 -07:00
Steven Moreland 606c19ecf8 Merge "aosp_arm64_ab is vndk" am: f38900dc92
am: 16d7c08dab

Change-Id: I27e880056b846e8781b665433c33d59268a8e670
2017-09-12 20:00:24 +00:00
Steven Moreland 16d7c08dab Merge "aosp_arm64_ab is vndk"
am: f38900dc92

Change-Id: I09157be57b71386912b0b96b9748932c30813acd
2017-09-12 19:48:12 +00:00
TreeHugger Robot e8d229c70f Merge "configstore: remove configstore 1.1" into oc-dr1-dev-plus-aosp 2017-09-07 01:09:31 +00:00
Steven Moreland fdce598ed8 aosp_arm64_ab is vndk
Test: builds with BOARD_VNDK_VERSION=current
Test: test only one product is using this w/ multiproduct_kati
Bug: 65375837
Merged-In: I972ab897a8bc23ba5c5f6bf133db0017e4334f40
Change-Id: I972ab897a8bc23ba5c5f6bf133db0017e4334f40
2017-09-05 22:31:30 +00:00
Sundong Ahn 43e711962e configstore: remove configstore 1.1
Configstore was down-revisioned from 1.1 to 1.0 in oc-dr1-dev,
oc-mr1-dev and oc-mr1-dev-plus-aosp. Therefore configstore in
oc-dr1-dev-plus-aosp will also be down-revisioned to 1.0.

Bug: 65124635
Test: build & boot test on sailfish + walleye
Change-Id: Ife60328110c6d6cb3e8024fb4a5caabc4c7c034f
Merged-In: I90d30584ad4499d4e20254be2974d9de1d3883c0
2017-09-01 05:38:25 +00:00
Bo Hu 35149ca0b7 Merge changes from topic "aosp-emulator-oc"
* changes:
  emulator: fix widevine drm vndbinder denial
  emulator: fix selinux issues
  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-31 22:56:31 +00:00
Lev Rumyantsev 77492a72a2 Merge "Move default native bridge value to build.prop"
am: e7a0516835

Change-Id: I34f92daf8fade009b524505e51d162a78d205ac3
2017-08-31 22:16:56 +00:00
Lev Rumyantsev be80acfd1a Move default native bridge value to build.prop
Before this change it was part of default.prop, which is applied
before init.rc is executed, so that scripts cannot override the property.

In contrast, build.prop is applied at "init-late" stage,
so that one has a chance to override the property in scripts using
"init" or "init-early" triggers.

(cherry-picked from 74b2da9db67f5da2195c9b07dab22c868934e396)

Test: fugu still works
Bug: 63133475
Merged-In: I0842abaaec1d353ebe4debda6dfe3e2c42146786
Change-Id: I0842abaaec1d353ebe4debda6dfe3e2c42146786
2017-08-31 12:13:37 -07:00
bohu dc745a9090 emulator: fix widevine drm vndbinder denial
[   86.252399] type=1400 audit(1503684692.153:25): avc: denied { read write } for pid=4160 comm="android.hardwar" name="vndbinder" dev="tmpfs" ino=5163 scontext=u:r:hal_drm_widevine:s0 tcontext=u:object_r:vndbinder_device:s0 tclass=chr_file permissive=0

BUG: 64726466

Test: build sdk_gphone_x86-user target, launch it
and the above denial should be fixed.

Change-Id: Ied1268878236c42fbb0751a0f33014b332d78c32
Merged-In: Ied1268878236c42fbb0751a0f33014b332d78c32
2017-08-30 17:13:55 -07:00
bohu 913a990249 emulator: fix selinux issues
with cas/camera/drm hals

BUG: 64726466

Test: build aosp_x86-eng, boot emulator
without camera/drm hals killed by
selinux avc denials; camera can take
pictures

Change-Id: I8a154fdb5d7aa7763aab2b912976eb9e1d329cdb
Merged-In: I8a154fdb5d7aa7763aab2b912976eb9e1d329cdb
2017-08-30 17:13:51 -07:00
bohu 7b5e1abacb emulator: squash misc modifications from oc-emu-dev
Change-Id: I7380292cd4dc851a987683bdf61d511dbf74aff6
Merged-In: I7380292cd4dc851a987683bdf61d511dbf74aff6
2017-08-30 17:13:47 -07:00
bohu bc43c4ec29 emulator: move rild.libpath to vendor
BUG: 62137708
Test: buld sdk_gphone_x86-user, launch
emulator make sure radio works

Change-Id: I4ef1483a8d95a74b54deb6f0d4b2461c733c8140
Merged-In: I4ef1483a8d95a74b54deb6f0d4b2461c733c8140
2017-08-30 17:13:37 -07:00
bohu ac0273f162 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
Merged-In: Ib3b7c4c48a22cecb44255e643402fd1c37797522
2017-08-30 17:13:32 -07:00
bohu e3f4e9f025 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
Merged-In: I70f58947e98b41b195d77b4347d2efdc09348392
2017-08-30 17:13:26 -07:00
Yahan Zhou 3cf7441dbe 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
Merged-In: I75b9f0de17fece3dec5ae1662400808af321bd4d
2017-08-30 17:13:20 -07:00
Yifan Hong fd8eded8f9 Merge changes from topic "kernel_config_arch"
am: 4b7cbf8395

Change-Id: Ic48088745d443c39cdea9d967412e21af2d28107
2017-08-29 18:34:48 +00:00
Yifan Hong 63e264d142 fwk comp mat: add arch specific kernel requirements
Test: m system_compatibility_matrix.xml -j
Bug: 64124223
Change-Id: Ieda3ea43e5d3b7d393461bd54b311b58af443f7c
Merged-In: Ieda3ea43e5d3b7d393461bd54b311b58af443f7c
2017-08-28 17:32:59 -07:00
Yifan Hong a508b30df5 fwk comp mat: use a for loop for supported kernel versions
Test: m system_compatibility_matrix.xml -j

Bug: 64124223
Change-Id: Ife95bfb5b7103239e116df1ae844cc3a643b4c28
Merged-In: Ife95bfb5b7103239e116df1ae844cc3a643b4c28
2017-08-28 17:32:59 -07:00
Isaac Chen 9f55141c5f Merge "Revert "Revert "Build support for 32-bit armv8-a"""
am: 9a888ebb51

Change-Id: I4f0b7b55de9a0b79d9f81f4aaa6c04ebd1e409b1
2017-08-25 02:03:26 +00:00
Isaac Chen 9a888ebb51 Merge "Revert "Revert "Build support for 32-bit armv8-a""" 2017-08-25 01:55:56 +00:00
Yifan Hong 0998353f08 Merge changes from topic "libvintf_cp"
am: 9bab2f5fa2

Change-Id: If2a7759c2d2f2596417814383a6a8aff91bceaa9
2017-08-24 19:53:47 +00:00
Yifan Hong 1aecc84239 Add <kernel> entry to fwk compat mat.
Test: builds and verify that system/compatibility_matrix.xml
      has configs filled.
Test: `vintf | tail` on marlin shows that fwk compat mat
      is compatible with runtime info.

Bug: 38324908
Change-Id: I8a35ea582fea1faa083c409ec58813c3ac82dc9c
Merged-In: I8a35ea582fea1faa083c409ec58813c3ac82dc9c
2017-08-24 11:28:04 -07:00
Bowgo Tsai eb7b438994 Pass FRAMEWORK_VBMETA_VERSION to assemble_vintf
Note that this depends on a change in avbtool:
  https://android-review.googlesource.com/#/c/406374/

Bug: 38325029
Test: builds system.img, checks $OUT/system/compatibility_matrix.xml
      contains correct vbmeta-version
Change-Id: Iacc0a2687fb39600ad6b8e9cfbfe5c1a3b90b40b
Merged-In: Iacc0a2687fb39600ad6b8e9cfbfe5c1a3b90b40b
2017-08-24 11:28:04 -07:00
Yifan Hong dae462bdd1 Accept multiple input files for device manifest.
Test: test with DEVICE_MANIFEST_FILE variable split
      into multiple files

Bug: 38217107
Change-Id: I1146898e4ccf0e8bac7d8541032f160476dbc148
Merged-In: I1146898e4ccf0e8bac7d8541032f160476dbc148
2017-08-24 11:28:02 -07:00
Jeff Vander Stoep 1c71c880e9 Merge "embedded.mk: move dependencies to sepolicy"
am: d6c7681d85

Change-Id: I23df5e25c31963e3119bd38ee1d90bb70df45e08
2017-08-23 21:58:21 +00:00
Isaac Chen f5af850a29 Revert "Revert "Build support for 32-bit armv8-a""
This reverts commit 7de79cbeaf.

Fixed CTS build issue by adding -march=armv7-a in cts/tests/tests/os/jni/Android.mk since the library built here needs/uses instruction (swp) obsolete in ARMv8.

Bug: 64964151
Test: lunch aosp_arm64-userdebug; make -j cts
      lunch aosp_x86-userdebug; make -j cts
      lunch aosp_sailfish-userdebug; make -j cts
      lunch aosp_bullhead-userdebug; make -j cts

Change-Id: Ic3a121600da8e2a9a2d5176b9680cd18ce457959
2017-08-23 10:58:57 +00:00
Jeff Vander Stoep f4941eb4a7 embedded.mk: move dependencies to sepolicy
Some selinux build packages are defined in embedded.mk,
others are defined in system/sepolicy/Android.mk. Move all
to sepolicy as a dependency of the phony package selinux_policy
which is defined in embedded.mk.

Test: build Marlin (Treble) and Angler (non-Treble)
Merged-In: I734c2909354349d146c6f78beb74bd990d9af30d
Change-Id: I734c2909354349d146c6f78beb74bd990d9af30d
2017-08-23 05:26:32 +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
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
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 24678e9469 Merge "Add com.android.location.provider to the system server classpath." 2017-08-15 07:32:10 +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
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
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