Commit Graph

40538 Commits

Author SHA1 Message Date
Dan Willemsen edb0a0e149 Merge "Mark some TARGET_* inputs as readonly" am: badd598c98
am: db0f20385a

Change-Id: I83bbcc4d926e3435f7a4cbdf27d43fe7562d1dd9
2017-10-31 19:50:42 +00:00
Dan Willemsen db0f20385a Merge "Mark some TARGET_* inputs as readonly"
am: badd598c98

Change-Id: I991fc456f18e2827c962509a5db54c2c7c16da69
2017-10-31 19:48:06 +00:00
Dan Willemsen badd598c98 Merge "Mark some TARGET_* inputs as readonly" 2017-10-31 19:43:55 +00:00
Victor Hsieh 2d43232c24 Merge "Migrate to the new apksig API" am: da343de3ba
am: 9d3b6c2ec4

Change-Id: I7a52983656e26b6ba98655f249f2522380ad6768
2017-10-31 19:27:10 +00:00
Victor Hsieh 9d3b6c2ec4 Merge "Migrate to the new apksig API"
am: da343de3ba

Change-Id: I4022a94ff5f7d4064e35204e42e69943cd3f2d57
2017-10-31 19:25:05 +00:00
Treehugger Robot da343de3ba Merge "Migrate to the new apksig API" 2017-10-31 19:19:52 +00:00
Victor Hsieh d50662502f Migrate to the new apksig API
Following the new API contract, this effectively add extra padding
before central dir to make it 4KB aligned.

Test: build succeeded
Bug: 30972906
Change-Id: I7cac9d2c4371b473c88df867b3b2ae906443db10
2017-10-31 08:24:02 -07:00
Justin Yun ef4f57af4a resolve merge conflicts of eb247544a7 to oc-mr1-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ib0c5ade0a1db65491b21226d5a2686ff6cf32d74
2017-10-31 15:27:52 +09:00
Justin Yun eb247544a7 Merge "Use vndk-sp phony module for vndk-sp package list"
am: d75168135a

Change-Id: I660ac95e4ae8b1a966cb590157c23316234df4ce
2017-10-31 05:44:51 +00:00
Treehugger Robot d75168135a Merge "Use vndk-sp phony module for vndk-sp package list" 2017-10-31 05:36:53 +00:00
Dan Willemsen 2c3f8366e2 Mark some TARGET_* inputs as readonly
Nobody should be changing these past this point.

Test: build_test.bash
Change-Id: I6eb574a0b4d339912d4a09f8f752294871965041
2017-10-30 19:38:25 -07:00
Justin Yun 83c8f78e00 Use vndk-sp phony module for vndk-sp package list
To install the vndk-sp libraries defined in device/generic/common,
use vndk-sp phony module to list the libraries.

Bug: 65853349
Test: build aosp_x86-user and check emulator boot
Change-Id: Idf2d421b5d84e04e332db9cb357a46c898a89c4e
(cherry picked from commit 740c6a3c7c)
2017-10-31 11:32:52 +09:00
Vishwath Mohan a4b881b0b0 Merge "CFI compatibility with static executables and nested archives" am: 22b6abc96d
am: 1a8bee951e

Change-Id: Ibf93f936d2f4df33ab554399459e8915c4308033
2017-10-31 01:56:02 +00:00
Vishwath Mohan 1a8bee951e Merge "CFI compatibility with static executables and nested archives"
am: 22b6abc96d

Change-Id: Ie72297f286af9ecf0ffeea9d093351c2c7a82fa0
2017-10-31 01:50:56 +00:00
Vishwath Mohan 22b6abc96d Merge "CFI compatibility with static executables and nested archives" 2017-10-31 01:42:16 +00:00
Colin Cross c11a7444ff Merge "Remove PRODUCT_AAPT2_CFLAGS and PRODUCT_AAPT_FLAGS" am: 8b664d0d96
am: 0f987bad82

Change-Id: I8505d76a1906fba682ad092b9f0964deeac33acb
2017-10-30 21:17:48 +00:00
Colin Cross 0f987bad82 Merge "Remove PRODUCT_AAPT2_CFLAGS and PRODUCT_AAPT_FLAGS"
am: 8b664d0d96

Change-Id: Id8331b1ed274356164d5949456c6d853045c3f47
2017-10-30 21:11:40 +00:00
Colin Cross 8b664d0d96 Merge "Remove PRODUCT_AAPT2_CFLAGS and PRODUCT_AAPT_FLAGS" 2017-10-30 20:58:08 +00:00
Dan Willemsen 2295cd6998 Merge "Prevent using config.mk from make, clean up unused code" am: 41cc5022c1
am: 69cecba031

Change-Id: I8fa09ad9a30ef90bda83380b96b693155c92ebf3
2017-10-30 20:33:48 +00:00
Dan Willemsen 69cecba031 Merge "Prevent using config.mk from make, clean up unused code"
am: 41cc5022c1

Change-Id: Ifbf6b6bac5875f29906e36d944183bc4d8a0bc74
2017-10-30 20:23:07 +00:00
Dan Willemsen 41cc5022c1 Merge "Prevent using config.mk from make, clean up unused code" 2017-10-30 20:11:32 +00:00
Stephen Hines 258ea7188c Merge "Switch to clang-4393122." am: 2957066979
am: f66ec58ca0

Change-Id: I64463e6826c0920e93e7c808a8b4128a1b356f78
2017-10-30 19:58:19 +00:00
Stephen Hines f66ec58ca0 Merge "Switch to clang-4393122."
am: 2957066979

Change-Id: If865d1df9b00cb4cd84b64bfec007c0ed4545edd
2017-10-30 19:46:12 +00:00
Stephen Hines 2957066979 Merge "Switch to clang-4393122." 2017-10-30 19:35:17 +00:00
Mathieu Chartier 356d58009c Add PRODUCT_MINIMIZE_JAVA_DEBUG_INFO to go_defaults_common
am: 99b2739a66

Change-Id: I24d503bc735a231b5e39c5a0745c3dacfdc64a15
2017-10-30 16:09:15 +00:00
Colin Cross d5cce4c360 Remove PRODUCT_AAPT2_CFLAGS and PRODUCT_AAPT_FLAGS
PRODUCT_AAPT2_CFLAGS and PRODUCT_AAPT_FLAGS are only used to pass
--pseudo-localize.  The flag doesn't need to be conditional on the
product, because the pseudo locale will be stripped out later if it
is not wanted.  Having it conditional on the product causes the
AAPT2-compiled resources to vary between products, which causes
unnecessary rebuilds when swithcing products.

Remove the variables, always add --pseudo-localize, and move
the AAPT2 compiled output to the common intermediates.

Test: m checkbuild
Change-Id: Iacc914114616b5bd19d9a1011802f4f9bca9bc19
2017-10-27 16:25:55 -07:00
Bo Hu 3424a614ac Merge changes I85dfbc3a,I332bc4df,Ia6c3ff08,I28dad25e,Ib25ae4a1, ... into stage-aosp-master
am: 0104049e4a  -s ours

Change-Id: If1b853c9c6688de82a9cc3ead1eaeb4ca8078b28
2017-10-27 15:43:25 +00:00
Bo Hu 0104049e4a Merge changes I85dfbc3a,I332bc4df,Ia6c3ff08,I28dad25e,Ib25ae4a1, ... into stage-aosp-master
* 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-10-27 15:35:21 +00:00
Vishwath Mohan 3d3e1cf260 CFI compatibility with static executables and nested archives
This CL makes the following changes:
(a) It disables diagnostics for CFI which requires the runtime ubsan
library (which isn't included in static executables).

(b) It applies the ar flags for CFI correctly for nested .a
archives.

(c) Applies the version script to export CFI shadow for non-static
binaries

(d) Doesn't apply cross-dso CFI for static executables

Bug: 30227045
Test: Static executables build correctly and do not complain about
missing symbols from the ubsan runtime library.
Test: Nested .a files correctly use the gold plugin.

Change-Id: Id8fe3c13f6b76565aafbf1266e95f50d1447a790
2017-10-27 03:26:27 -07:00
bohu 8fcf2089e5 Merge changes from topic "aosp-oc-mr1-emulator" am: 0bbd8d9e37 -s ours
am: e4f4232eb7  -s ours

Change-Id: I7c3fd1114789ff8408b9fa4b25933feecb5e0a12
2017-10-27 06:45:40 +00:00
bohu f67cc1002f emulator: fix widevine drm vndbinder denial am: 30b232885a -s ours
am: 61451fdaa8  -s ours

Change-Id: Idd47b7b5032ce784c8fdd3322bc105778b7456a2
2017-10-27 06:43:17 +00:00
bohu e4f4232eb7 Merge changes from topic "aosp-oc-mr1-emulator"
am: 0bbd8d9e37  -s ours

Change-Id: I4ad3877f1a04afb4a9e44ee121254cfef5cdf78c
2017-10-27 06:36:24 +00:00
bohu 61451fdaa8 emulator: fix widevine drm vndbinder denial
am: 30b232885a  -s ours

Change-Id: I0222aef0cd33b787b9cf79bf785cb405f5670c59
2017-10-27 06:32:56 +00:00
Treehugger Robot 0bbd8d9e37 Merge changes from topic "aosp-oc-mr1-emulator"
* 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-10-27 06:21:30 +00:00
Colin Cross db4599249c Merge changes I3bafbb2d,If30943ef am: 0239edea1d
am: a07bd94354

Change-Id: I323247384441ea00698df0eeb37c0572a6d01ac1
2017-10-27 01:54:01 +00:00
Colin Cross a07bd94354 Merge changes I3bafbb2d,If30943ef
am: 0239edea1d

Change-Id: I54ea37fafa54d5b74093b483c2eb13464440661a
2017-10-27 01:49:35 +00:00
Colin Cross 0239edea1d Merge changes I3bafbb2d,If30943ef
* changes:
  Desugar default methods if required
  Fix desugaring when LOCAL_SDK_VERSION is not set
2017-10-27 01:40:15 +00:00
bohu 30b232885a 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: I85dfbc3acdcbdf0431d4657c7d664ac4c781736b
Merged-In: Ied1268878236c42fbb0751a0f33014b332d78c32
2017-10-26 16:45:05 -07:00
bohu 97252db917 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: I332bc4dfa958f5213a8650c7314963b6bf33d519
Merged-In: I8a154fdb5d7aa7763aab2b912976eb9e1d329cdb
2017-10-26 16:45:05 -07:00
bohu 813249bfdf emulator: squash misc modifications from oc-emu-dev
Change-Id: Ia6c3ff0805b88ef284524a4e6faa5615016b359c
Merged-In: I7380292cd4dc851a987683bdf61d511dbf74aff6
2017-10-26 16:45:05 -07:00
bohu 49415ab9b1 emualtor: keep libopenjdkjvmti*.so on sdk images
BUG: 38353037

Those libopenjdkjvmti*.so files are needed by profilers.
Those files are shipped on real devices as well.

Change-Id: I28dad25eb61da424dcf87ab1f17277df340f9124
Merged-In: Iac7dd2844b0f3ea5194dec8732fbaacf53c4bf4a
2017-10-26 16:45:05 -07:00
bohu 4a6cc6a8fc emulator: move rild.libpath to vendor
BUG: 62137708
Test: buld sdk_gphone_x86-user, launch
emulator make sure radio works

Change-Id: Ib25ae4a1c7f86ef20a45af2f88732067ad95c5f4
Merged-In: I4ef1483a8d95a74b54deb6f0d4b2461c733c8140
2017-10-26 16:45:05 -07:00
bohu 179849ade7 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: Iccaea540b2a27f45fd487dd25408b5d5c047171c
Merged-In: Ib3b7c4c48a22cecb44255e643402fd1c37797522
2017-10-26 16:45:05 -07:00
bohu cb0bebbeda 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: I7f5317d52e552367a1390789fe7ce6e0955ba8de
Merged-In: I70f58947e98b41b195d77b4347d2efdc09348392
2017-10-26 16:45:05 -07:00
Yahan Zhou 3afe69d846 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: I330adc6da2999031d4ed2d8c4ade4667c1d0b511
Merged-In: I75b9f0de17fece3dec5ae1662400808af321bd4d
2017-10-26 16:45:05 -07:00
bohu 2ca363a63e 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: I85dfbc3acdcbdf0431d4657c7d664ac4c781736b
Merged-In: Ied1268878236c42fbb0751a0f33014b332d78c32
2017-10-26 16:24:06 -07:00
bohu 8d5f2e8622 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: I332bc4dfa958f5213a8650c7314963b6bf33d519
Merged-In: I8a154fdb5d7aa7763aab2b912976eb9e1d329cdb
2017-10-26 16:23:44 -07:00
bohu 4ac55e0bbb emulator: squash misc modifications from oc-emu-dev
Change-Id: Ia6c3ff0805b88ef284524a4e6faa5615016b359c
Merged-In: I7380292cd4dc851a987683bdf61d511dbf74aff6
2017-10-26 16:23:14 -07:00
bohu c272ea51da emualtor: keep libopenjdkjvmti*.so on sdk images
BUG: 38353037

Those libopenjdkjvmti*.so files are needed by profilers.
Those files are shipped on real devices as well.

Change-Id: I28dad25eb61da424dcf87ab1f17277df340f9124
Merged-In: Iac7dd2844b0f3ea5194dec8732fbaacf53c4bf4a
2017-10-26 16:22:02 -07:00
bohu a76b9228ca emulator: move rild.libpath to vendor
BUG: 62137708
Test: buld sdk_gphone_x86-user, launch
emulator make sure radio works

Change-Id: Ib25ae4a1c7f86ef20a45af2f88732067ad95c5f4
Merged-In: I4ef1483a8d95a74b54deb6f0d4b2461c733c8140
2017-10-26 16:21:43 -07:00