Commit Graph

40522 Commits

Author SHA1 Message Date
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
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
bohu a0d1dac1af 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:21:25 -07:00
bohu 5356718c02 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:20:56 -07:00
Yahan Zhou fcdc30a4e6 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:11:58 -07:00
Colin Cross 5ea99d420b Desugar default methods if required
Desugar default methods if requested by LOCAL_MIN_SDK_VERSION < 26.
Also remove --desugar_try_with_resources_if_needed=false, it is no
longer necessary if we always proguard against frameworks.jar.
Fixes d8 issues when it sees unexpected default methods that dx
was passing through.

This reapplies I81796b452d5a70a951e175727953d4295ca32c0c after
If30943efcaea44b2db1b38a6c1d558113324757f.

Test: m checkbuild
Change-Id: I3bafbb2d63de2a6b50bc8c7ff40259b54d24f128
2017-10-26 13:09:07 -07:00
Colin Cross 98caed6e7f Fix desugaring when LOCAL_SDK_VERSION is not set
When LOCAL_SDK_VERSION is not set, frameworks.jar is put
in the classpath for javac.  If it is also in the classpath
(as opposed to the bootclasspath) for desugar then desugar
tries to rewrite classes that implement interfaces with
default methods to contain calls to the generated companion
classes for those interfaces.  frameworks.jar will not
contain the companion classes, which causes proguard to
fail.

Move frameworks.jar to the bootclasspath, which matches more
closely with builds against the SDK stubs jars.

Also remove the static libraries from the classpath, they have
already been merged into the input jar.

Test: m checkbuild
Change-Id: If30943efcaea44b2db1b38a6c1d558113324757f
2017-10-26 13:09:07 -07:00
Dan Willemsen b87e0577b0 Merge "Check for module names in LOCAL_ADDITIONAL_DEPENDENCIES" am: d1af74bd70
am: 67c3822303

Change-Id: I3af5a86c574f047e31249af255c2ff2b0e2ed489
2017-10-26 17:44:36 +00:00
Dan Willemsen 67c3822303 Merge "Check for module names in LOCAL_ADDITIONAL_DEPENDENCIES"
am: d1af74bd70

Change-Id: If269291261edc1b9dae42b61fd482d9b5cd5d80f
2017-10-26 17:40:30 +00:00
Treehugger Robot d1af74bd70 Merge "Check for module names in LOCAL_ADDITIONAL_DEPENDENCIES" 2017-10-26 17:32:28 +00:00
Søren Gjesse 2c48f8b97e Merge "Define proguard dictionary output for R8" am: 2f05802a78
am: 85a4b57d94

Change-Id: I8a8b130931cd15f4c9bf6181b16d158eef4dec18
2017-10-26 06:29:30 +00:00
Dan Willemsen 0c821a9882 Check for module names in LOCAL_ADDITIONAL_DEPENDENCIES
If anything looks like a module name instead of a path (so if it doesn't
have a / in it), forbid it from being in LOCAL_ADDITIONAL_DEPENDENCIES.

Phony modules should not be dependencies, since they're never considered
clean, and will force rebuilds. It will also force installation when
we're only attempting to checkbuild. Most of the time
LOCAL_REQUIRED_MODULES should be used instead, which will trigger the
required modules to be installed if the local module is installed.

Bug: 68042065
Test: build/soong/build_test.bash on aosp and internal
Change-Id: I058ed6734d895eba3417b1d47c7f4a6b341bc137
2017-10-25 23:23:28 -07:00
Søren Gjesse 85a4b57d94 Merge "Define proguard dictionary output for R8"
am: 2f05802a78

Change-Id: I32f3fb1f8d64c61c6484d3dd28f82bd099721599
2017-10-26 06:19:53 +00:00
Søren Gjesse 2f05802a78 Merge "Define proguard dictionary output for R8" 2017-10-26 06:08:43 +00:00
Jeff Gaston 9db282fd57 Merge "Skip instrumenting non-class files" am: fbe8759872
am: 6449fe47c4

Change-Id: I6d30cf0262d29b81646a88beb490249749d078f9
2017-10-26 03:01:49 +00:00
Jeff Gaston 6449fe47c4 Merge "Skip instrumenting non-class files"
am: fbe8759872

Change-Id: I218ca550a9848e799b60df9b511930bd9ec2297c
2017-10-26 02:58:10 +00:00
Treehugger Robot fbe8759872 Merge "Skip instrumenting non-class files" 2017-10-26 02:50:01 +00:00
Jeff Gaston 6fdbdc86f6 Skip instrumenting non-class files
Jacoco normally recurses into .jar files, but we don't want it to.
Some .jar files may be intentionally corrupt test files.

Test: m -j showcommands dist EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true SKIP_BOOT_JARS_CHECK=true WITH_DEXPREOPT=false cts google-tradefed-all general-tests tests
Bug: 68056327
Change-Id: I1550e3acafd7cd9a65164742370e051d3eb3bf69
2017-10-25 16:36:05 -07:00