Commit Graph

13984 Commits

Author SHA1 Message Date
Tobias Thierer c4803f6d63 Merge "Fix log spam in unzip-jar-files" am: 05ecd66557 am: 17f23f3837 am: f161741543
am: 345347f527

Change-Id: Icb086e4bd17314e881378bd6b54655ed787367b9
2017-08-16 10:12:46 +00:00
Tobias Thierer 345347f527 Merge "Fix log spam in unzip-jar-files" am: 05ecd66557 am: 17f23f3837
am: f161741543

Change-Id: I24ceed9fa2e258a2c1a43bac2d9397862df7cf05
2017-08-16 10:09:12 +00:00
Tobias Thierer f161741543 Merge "Fix log spam in unzip-jar-files" am: 05ecd66557
am: 17f23f3837

Change-Id: Id49b99ce742c23fb49db0231b3212a7a50c69756
2017-08-16 10:04:15 +00:00
Tobias Thierer 17f23f3837 Merge "Fix log spam in unzip-jar-files"
am: 05ecd66557

Change-Id: I44836b434fabc250ea95dd7f3e5ce3572863be44
2017-08-16 10:00:47 +00:00
Tobias Thierer 05ecd66557 Merge "Fix log spam in unzip-jar-files" 2017-08-16 09:54:46 +00:00
Jason Tholstrup 40098dca31 Updated static_java_library.mk to support proguard options.
For reference we are trying to build an AAR and want to filter out anything private and anything marked @hide.

Test: built dist and verified package contents.

Change-Id: I2b9847501d677f56d3918ac0694e6e1f6cda32c8
Merged-In: I2b9847501d677f56d3918ac0694e6e1f6cda32c8
(cherry picked from commit 37926dedfd)
2017-08-15 16:06:04 -07:00
Tobias Thierer 341ccb6161 Fix log spam in unzip-jar-files
Commit 2bdbb6e935 added
command line flags to the unzip command in unzip-jar-files
to skip the path 'module-info.class', if present.

This has led to log spam because unzip warns when an
excluded file is not present in the zip/jar file, and
that warning cannot be suppressed via command line flags.
Therefore, this CL modifies the unzip-jar-files macro
to rm -f the module-info.class file after the fact, if
it was created, which does not lead to log spam.

Note that module-info.class will be filtered out of
.jar dependencies (such as ASM 6.0) regardless of
whether one is building with an OpenJDK 9+ toolchain.

Test: Treehugger.
Bug: 64719206
Change-Id: Ic6be806a50557b4ba13fc18da91a8af12d14586c
2017-08-15 20:51:49 +01:00
Narayan Kamath e8a37e2ef8 Merge "apkcerts: Add information about the compressed state of the APK." into oc-mr1-dev
am: fd6cbbe609

Change-Id: Ia7e22ad69d1149f80107db12de53136b4b15bc8d
2017-08-15 08:35:57 +00:00
Narayan Kamath fd6cbbe609 Merge "apkcerts: Add information about the compressed state of the APK." into oc-mr1-dev 2017-08-15 08:28:25 +00:00
Ivan Lozano e742c1bffc Merge "Don't append _asan to non-asan build flavors." am: 1782e17ef2 am: 781469ac0a am: 5930ad5195
am: 1e0ff197ca

Change-Id: Ib28bc8b03043c1ef1e3117f990eb3799d6f76ef6
2017-08-14 22:54:50 +00:00
Steve Muckle 8925146bbb resolve merge conflicts of d4eb7a322c to oc-dr1-dev-plus-aosp
am: 1ff81a85b6

Change-Id: Ic0fb54f2a795dea4ef50c6bdde149d808032970a
2017-08-14 22:53:51 +00:00
Ivan Lozano 1e0ff197ca Merge "Don't append _asan to non-asan build flavors." am: 1782e17ef2 am: 781469ac0a
am: 5930ad5195

Change-Id: I6f73c3f2f74c8613941331d49bdba6717a220c02
2017-08-14 22:41:20 +00:00
bohu e0df62696b sdk: add vendor-qem.img into the deps list
am: a508578811

Change-Id: Ida3fff2889517ddeb06cc60aeea78b0a87ffa187
2017-08-14 22:32:47 +00:00
Steve Muckle 1ff81a85b6 resolve merge conflicts of d4eb7a322c to oc-dr1-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ibca2aa11ede8142639f919eebeaf879236f82c8b
2017-08-14 15:17:58 -07:00
bohu a508578811 sdk: add vendor-qem.img into the deps list
if it exists. Fix master-without-vendor sdk_x86-sdk build

Change-Id: I5656e7124d30e71120044cce668c54793f77208a
2017-08-14 14:52:20 -07:00
Ivan Lozano 5930ad5195 Merge "Don't append _asan to non-asan build flavors." am: 1782e17ef2
am: 781469ac0a

Change-Id: I4ce31239411d47b05caee51d051c121786f15083
2017-08-14 21:14:18 +00:00
Ivan Lozano 781469ac0a Merge "Don't append _asan to non-asan build flavors."
am: 1782e17ef2

Change-Id: I8f7aaf1152e7e964e7983d91308181077dc7c6f4
2017-08-14 21:10:39 +00:00
Steve Muckle d4eb7a322c resolve merge conflicts of b145b04127 to stage-aosp-master
am: fa6595001a

Change-Id: I447e4c629c004fe394e0aca346f89fe4662cb214
2017-08-14 21:10:15 +00:00
Steve Muckle fa6595001a resolve merge conflicts of b145b04127 to stage-aosp-master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ice4e7c23c5a6e0ba4aa085e82c121d472f89209a
2017-08-14 13:00:27 -07: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 55e9891688 emualtor: keep libopenjdkjvmti*.so on sdk images
am: e5e0742444

Change-Id: I94da81e1d0f7975a3e2eca7d4a428d3fe67add83
2017-08-14 18:49:35 +00:00
Yahan Zhou 5a4f08b459 Build vendor image for emulator
am: c61b6bd2ed

Change-Id: Ieaa190c1bd9a356f39fa72ba5cd37570d6bba233
2017-08-14 18:48:45 +00:00
Ivan Lozano 1782e17ef2 Merge "Don't append _asan to non-asan build flavors." 2017-08-14 18:47:43 +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
Treehugger Robot b145b04127 Merge "Move build-image-kernel-modules out of recovery macro" 2017-08-14 16:24:31 +00:00
Alex Klyubin d41da2b7cf Merge "Revert "Let signapk access internal APIs under OpenJDK 9 toolchain"" am: 42ce465e83 am: 8191dfb49e am: d98708d71f
am: 66d2b8b185

Change-Id: Ie0348176ee8a1cab2552923dc38fd982de0e58bd
2017-08-14 16:16:23 +00:00
Alex Klyubin 66d2b8b185 Merge "Revert "Let signapk access internal APIs under OpenJDK 9 toolchain"" am: 42ce465e83 am: 8191dfb49e
am: d98708d71f

Change-Id: I1acdef3b3c2343a477d1f12528c4cc36c586735b
2017-08-14 16:12:23 +00:00
Alex Klyubin d98708d71f Merge "Revert "Let signapk access internal APIs under OpenJDK 9 toolchain"" am: 42ce465e83
am: 8191dfb49e

Change-Id: If7ae27d99d553074e06bf8bff724a4f126ea3968
2017-08-14 16:05:27 +00:00
Alex Klyubin 8191dfb49e Merge "Revert "Let signapk access internal APIs under OpenJDK 9 toolchain""
am: 42ce465e83

Change-Id: I9ac004ecfcb36b0cc947e1c6c820142771f6361b
2017-08-14 16:01:33 +00:00
Ivan Lozano 0f71db3248 Don't append _asan to non-asan build flavors.
Right now we add the '_asan' suffix to the build flavor whenever
SANITIZE_TARGET is defined. This patch ensures the suffix is only
added when SANITIZE_TARGET=address.

Test: Checked flavor of SANITIZE_TARGET=address and integer_overflow
builds.
Bug: 30969751
Bug: 64561273

Change-Id: Ie20340f81b395e0b6b5f8086350bbc20f83d5fa4
2017-08-14 08:25:03 -07:00
Narayan Kamath 6a4bd696f6 apkcerts: Add information about the compressed state of the APK.
We add a compressed="$extension" attribute to an APK's entry if it's
compressed.

Bug: 64531948
Test: make dist

Change-Id: Ic3f95ed77f0bb16dec825bae944c70ee2d130657
2017-08-14 14:50:28 +01:00
bohu 753e9e4462 emulator: squash misc modifications from oc-emu-dev
Change-Id: I7380292cd4dc851a987683bdf61d511dbf74aff6
2017-08-13 22:32:01 -07:00
bohu e5e0742444 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: Iac7dd2844b0f3ea5194dec8732fbaacf53c4bf4a
2017-08-13 22:31:53 -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
Alex Klyubin 4012e648ea Revert "Let signapk access internal APIs under OpenJDK 9 toolchain"
This reverts commit 9cc3c76abd which
added command-line parameters to the invocation of SignApk to permit
it to access sun.** classes which are not accessible by default in
Java 9. This hack is no longer needed because SignApk no longer needs
this access because of tools/apksig commit
b40d3e4821bc9cb094b0ff13153340e3a0da1b3f which switched APK JAR
signature generation logic away from directly using sun.** classes.

Test: find out -name CtsPkgInstallTinyApp* | xargs rm -Rf
      mmma -j74 cts/hostsidetests/appsecurity/test-apps/tinyapp
Test: find out -name CtsPkgInstallTinyApp* | xargs rm -Rf
      EXPERIMENTAL_USE_OPENJDK9=target1.8 \
        OVERRIDE_ANDROID_JAVA_HOME=<path to Java 9 SDK> \
        PATH=${OVERRIDE_ANDROID_JAVA_HOME}/bin:${PATH} \
        mmma -j74 cts/hostsidetests/appsecurity/test-apps/tinyapp
Bug: 37137869
Change-Id: I389c366f8a5bed56c496293bc871458adbedb0e8
2017-08-11 11:15:54 -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
Tobias Thierer 9ab835d4e5 Merge "Omit module-info.class when unzipping jar files." am: 5ae6434575 am: 3e55981366 am: da8798f218
am: ab333afe68

Change-Id: I30700c24c900ef7cef3f24ab0eda911e7b86c91c
2017-08-11 13:22:51 +00:00
Tobias Thierer ab333afe68 Merge "Omit module-info.class when unzipping jar files." am: 5ae6434575 am: 3e55981366
am: da8798f218

Change-Id: Ia4547cfe5ce05ac7d4db99184017202ff54f7d21
2017-08-11 13:18:58 +00:00
Tobias Thierer da8798f218 Merge "Omit module-info.class when unzipping jar files." am: 5ae6434575
am: 3e55981366

Change-Id: I6e5acbc3381dedd0fddbbfed1f2381174f83ca1a
2017-08-11 13:14:19 +00:00
Tobias Thierer 3e55981366 Merge "Omit module-info.class when unzipping jar files."
am: 5ae6434575

Change-Id: If31f78c730339473cd5cd5e1bc83a3a3562bad3c
2017-08-11 13:11:05 +00:00
Tobias Thierer 5ae6434575 Merge "Omit module-info.class when unzipping jar files." 2017-08-11 13:05:02 +00:00
Narayan Kamath 877a64c813 Merge "Implement LOCAL_COMPRESSED_MODULE." into oc-mr1-dev
am: 2f6b55266a

Change-Id: Ibe8746049242110b1f1c75bb5a5963039c875b40
2017-08-11 09:38:32 +00:00
Narayan Kamath 2f6b55266a Merge "Implement LOCAL_COMPRESSED_MODULE." into oc-mr1-dev 2017-08-11 09:30:33 +00:00
Jeff Hao 4ae165c7ae 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.

Bug: 62554875
Test: mm test-art-host

(cherry picked from commit 865d54caf2)

Change-Id: Id711ad1c2d98b12b0f55a29acca8a96834d69ede
2017-08-10 15:21:44 -07:00
Narayan Kamath 7c205107ce Implement LOCAL_COMPRESSED_MODULE.
- Prebuilts with LOCAL_MODULE_CLASS == APPS and BUILD_PACKAGE that
  define LOCAL_COMPRESSED_MODULE := true will be installed compressed
  in the system partition.
- The compression algorithm is simple gzip for now.

In addition :
- Compressed modules are not dex-preopted.
- JNI shared libraries are always embedded inside compressed modules,
  they are never installed as separate files on the FS.

Test: Manual
Bug: 63802184

Change-Id: Id12b1ff0b1d68791ec1178783f7e78910e122a33
2017-08-10 12:38:11 +01:00
Jeff Gaston fba80a04c0 Merge "Consolidate build system usage documentation into source control" am: ea98ab2d3c am: 0f4e0a981e am: 0339379733
am: d28e18c2b4

Change-Id: Idee81aed000937b619d4c9b1d5c2fe90d47a7d6f
2017-08-10 00:37:55 +00:00
TreeHugger Robot a32a8c0b43 Merge "build: aux: Fix link type checking for AUX builds" into oc-mr1-dev 2017-08-09 23:57:36 +00:00
Jeff Gaston d28e18c2b4 Merge "Consolidate build system usage documentation into source control" am: ea98ab2d3c am: 0f4e0a981e
am: 0339379733

Change-Id: I29e6b47a92e35344b36b28632893b16dafd46edc
2017-08-09 22:52:24 +00:00