Commit graph

38185 commits

Author SHA1 Message Date
Jeff Gaston
12a4b403c2 Merge "Revert "Use the Finder's results for faster searching"" am: 6df0626e58
am: 8467fba043

Change-Id: I81b33819eca94977b72a447db3486293f6b01f11
2017-08-17 20:27:04 +00:00
Jeff Gaston
8467fba043 Merge "Revert "Use the Finder's results for faster searching""
am: 6df0626e58

Change-Id: I93d5c8df8500a5ea99751842b3585708e23fc251
2017-08-17 20:23:35 +00:00
Jeff Gaston
6df0626e58 Merge "Revert "Use the Finder's results for faster searching"" 2017-08-17 20:15:43 +00:00
Jeff Gaston
6f2aea5636 Revert "Use the Finder's results for faster searching"
This reverts commit 4e3ea546d7.

Reason for revert: New Build Breakage: aosp-master/build_test @ 4283735

Change-Id: Icf62c628c1d0cb0b1fd4b401ae1a866f7f88c477
2017-08-17 20:13:08 +00:00
Jeff Gaston
285812156b Merge "Use the Finder's results for faster searching" am: 2d71b221cb
am: 1b1997c028

Change-Id: I797bf0041f051b34b4160d2ed12a3ea878ce7aca
2017-08-17 19:52:04 +00:00
Jeff Gaston
1b1997c028 Merge "Use the Finder's results for faster searching"
am: 2d71b221cb

Change-Id: I4e78ca9eabeb8259be4a5996d53737719485d9df
2017-08-17 19:48:33 +00:00
Jeff Gaston
2d71b221cb Merge "Use the Finder's results for faster searching" 2017-08-17 19:40:56 +00:00
Colin Cross
da54a77928 Merge "Sort files in directories passed to jar" am: 966ed15a1d
am: 604a2423b6

Change-Id: Ib149ee2190cc94af3e9f9934e2aaa23029c3222a
2017-08-17 01:02:45 +00:00
Colin Cross
604a2423b6 Merge "Sort files in directories passed to jar"
am: 966ed15a1d

Change-Id: If01ba7d294e4308a28580b157b9efdb6c860bb35
2017-08-17 01:00:13 +00:00
Treehugger Robot
966ed15a1d Merge "Sort files in directories passed to jar" 2017-08-17 00:48:37 +00:00
Colin Cross
128800f2c8 Sort files in directories passed to jar
jar -C <dir> . produces a jar containing files in filesystem order,
which can vary between builds.  Manually find and sort the list of
files, and convert them into a list of -C <dir> <file> pairs.

Fixes: 64634025
Test: m -j checkbuild
Test: m -j out/target/product/sailfish/system/framework/ext.jar, check
      that entries are sorted
Test: m -j out/target/product/generic_arm64/system/framework/ext.jar on mac
Change-Id: I7dced6acbe621a60cd49daf17872941485602732
2017-08-16 13:37:00 -07: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
3faefab6d9 Merge "Updated static_java_library.mk to support proguard options." am: 14e5c5975c -s ours
am: fbc9ffd072  -s ours

Change-Id: I4af4bb010e43df4b72b6cd8de9e33bf6602db8ef
2017-08-16 00:40:10 +00:00
Jason Tholstrup
fbc9ffd072 Merge "Updated static_java_library.mk to support proguard options."
am: 14e5c5975c  -s ours

Change-Id: Ifbde7e8c1638ffc0e43d958715d6939229c8f8ce
2017-08-16 00:30:11 +00:00
Treehugger Robot
14e5c5975c Merge "Updated static_java_library.mk to support proguard options." 2017-08-16 00:15:05 +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
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
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
Ivan Lozano
1782e17ef2 Merge "Don't append _asan to non-asan build flavors." 2017-08-14 18:47:43 +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
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
Alex Klyubin
42ce465e83 Merge "Revert "Let signapk access internal APIs under OpenJDK 9 toolchain"" 2017-08-14 15:54:01 +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
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
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
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
Jeff Gaston
4e3ea546d7 Use the Finder's results for faster searching
Bug: 64363847
Test: m -j

Change-Id: Ie0905d8c5c54cd4c0c3b3edda6c3f1c4135ed7ed
2017-08-10 18:43:00 -07:00
Treehugger Robot
cb674cf05d Merge "Phony module vndk_package is added" 2017-08-11 01:38:15 +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
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
Jeff Gaston
0339379733 Merge "Consolidate build system usage documentation into source control" am: ea98ab2d3c
am: 0f4e0a981e

Change-Id: I3ac108c27b4fda57ddb0960a122e5feebcb9345b
2017-08-09 22:40:02 +00:00
Jeff Gaston
0f4e0a981e Merge "Consolidate build system usage documentation into source control"
am: ea98ab2d3c

Change-Id: I1a8a6189f8ae791329c7da87e78b67e8c46e20d7
2017-08-09 22:30:38 +00:00
Jeff Gaston
ea98ab2d3c Merge "Consolidate build system usage documentation into source control" 2017-08-09 22:17:43 +00:00
Jeff Gaston
c6dfc4e95a Consolidate build system usage documentation into source control
Bug: 62201421

Test: make help
Change-Id: I7a7c917f767590657761396dd0545224ff98f27b
2017-08-09 12:58:30 -07:00
Mark Salyzyn
5d9e6eb512 Merge "logcat: permit transition to Android.bp" am: 374f753211
am: 1830c9596d

Change-Id: I0fbe9bf8f12c10ce30fddc2e1a3ed9c66b21c6ce
2017-08-08 23:16:27 +00:00
Nan Zhang
26bd7be44c Merge "Fix the typo: "desugar-classpath" to "desugar-bootclasspath"" am: 9758900b56
am: 4988fa2ffe

Change-Id: Ib2e1e87d23fa3ce87cb13ae90e79800c68c17365
2017-08-08 23:16:01 +00:00
Mark Salyzyn
1830c9596d Merge "logcat: permit transition to Android.bp"
am: 374f753211

Change-Id: Ieeee905248faea638ed18831ba2168f2914f7d02
2017-08-08 23:10:03 +00:00
Nan Zhang
4988fa2ffe Merge "Fix the typo: "desugar-classpath" to "desugar-bootclasspath""
am: 9758900b56

Change-Id: I72160219c0559e39b83df007f7c607cbed8db5a1
2017-08-08 23:09:24 +00:00