Commit Graph

13835 Commits

Author SHA1 Message Date
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
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
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 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
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 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
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
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 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
Nan Zhang e8f5213aa4 Merge "Fix the typo: "desugar-classpath" to "desugar-bootclasspath"" am: 9758900b56 am: 4988fa2ffe
am: 26bd7be44c

Change-Id: I2b98246750349cef4eff75914b4eeea9dfe7d947
2017-08-08 23:31: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
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
Nan Zhang f4571792f7 Fix the typo: "desugar-classpath" to "desugar-bootclasspath"
Test: runs "m -j checkbuild tests cts", and then --bootclasspath_entry
shows up in desugar command.

Change-Id: Ibcc8a3f51438723151c57f79e5a1184350efbd30
2017-08-08 13:38:59 -07:00
Tobias Thierer 2bdbb6e935 Omit module-info.class when unzipping jar files.
During the Android build process, multiple .jar files are
unzipped into the same directory. If the .jar is an OpenJDK 9
modular jar (with a module-info.class in the root directory),
the last module-info.class extracted will overwrite any earlier
module-info.class files extracted, and will cause all extracted
class files to be considered part of that module.

Therefore, this would break compilation under OpenJDK 9 (with
-target 1.9 -source 1.9). This CL fixes this by omitting the
module-info.class file (if present) when extracting the .jar.

This essentially turns any modular jar into a regular jar,
replacing the module with corresponding classes on the classpath.
This is sufficient for now because Android does not currently
support module dependencies.

Test: Treehugger
Bug: 38177569
Change-Id: Ia184e64d2f24b8ca79aeab1c00bd5da0386530bf
2017-08-08 20:09:54 +01:00
Jeff Hao 7e6899ac53 Merge "Add dirty-images-objects handling to boot image build." am: 5848fedea8 am: 3b16c4e7c7
am: 5b3e24484c

Change-Id: I18365f7c17ccb0b2e90dd4ecfbddaeb5843bcfde
2017-08-05 01:20:34 +00:00
Jeff Hao 5b3e24484c Merge "Add dirty-images-objects handling to boot image build." am: 5848fedea8
am: 3b16c4e7c7

Change-Id: I2786f4baa79a9842d91426a721cee80b1f039900
2017-08-05 01:13:40 +00:00
Jeff Hao 3b16c4e7c7 Merge "Add dirty-images-objects handling to boot image build."
am: 5848fedea8

Change-Id: Ida5683c28ed78db625a5383f52b81a087373ea75
2017-08-05 01:02:18 +00:00
Treehugger Robot 5848fedea8 Merge "Add dirty-images-objects handling to boot image build." 2017-08-05 00:55:48 +00:00
Colin Cross 27e0e4b27a Merge "Revert "Revert "Copy resources from classes.jar when using AAPT2""" am: e2b98ace94 am: a4e638689b
am: 77ac7ceef7

Change-Id: I2ddc709d9c9a98f266d0f879879fdb1480ed5db6
2017-08-04 21:14:33 +00:00
Colin Cross 77ac7ceef7 Merge "Revert "Revert "Copy resources from classes.jar when using AAPT2""" am: e2b98ace94
am: a4e638689b

Change-Id: I7d558d83c5cf6fcc251767299d0a98115b057b2f
2017-08-04 21:08:01 +00:00
Colin Cross a4e638689b Merge "Revert "Revert "Copy resources from classes.jar when using AAPT2"""
am: e2b98ace94

Change-Id: Id0850fff121beab0920e06440c7271d7622387b0
2017-08-04 21:02:35 +00:00
Treehugger Robot e2b98ace94 Merge "Revert "Revert "Copy resources from classes.jar when using AAPT2""" 2017-08-04 20:44:15 +00:00
Colin Cross 303567c922 Revert "Revert "Copy resources from classes.jar when using AAPT2""
This reverts commit a7e336d17a.

Reapplies I6649f7f2fbf63ff5001f4731e22960f857726c70 with fix
for jack builds.

Bug: 64272170
Test: https://android-build.googleplex.com/builds/view-workplan?viewType=Table&workplanId=L93000000088657848&nodeType=Trybot
Change-Id: Id66aebfc2c26a4467e6cf25e4372080882f0b286
Merged-In: Id66aebfc2c26a4467e6cf25e4372080882f0b286
(cherry picked from commit 6fedebf936)
2017-08-04 09:35:13 -07:00
Calin Juravle ca79eec29e Merge "Replace -classpath with --class-loader-context for preopt" am: 1a7b46bf71 am: a0cf6dc2dc
am: b96e433ba1

Change-Id: I3c0d6191daee33ff0e4a5f6a6e15a5c4ba594962
2017-08-03 21:25:12 +00:00
Calin Juravle b96e433ba1 Merge "Replace -classpath with --class-loader-context for preopt" am: 1a7b46bf71
am: a0cf6dc2dc

Change-Id: I54f1b7faebb917c0dfdc0a22d9a1dbe97958260e
2017-08-03 21:15:08 +00:00
Calin Juravle a0cf6dc2dc Merge "Replace -classpath with --class-loader-context for preopt"
am: 1a7b46bf71

Change-Id: I978c17cb5ca92ad21a30d983ef42241dbff58944
2017-08-03 21:09:04 +00:00
Calin Juravle 1a7b46bf71 Merge "Replace -classpath with --class-loader-context for preopt" 2017-08-03 20:57:38 +00:00
Jeff Hao b454ee195a 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.

(cherry-picked from commit 865d54caf2)

Bug: 62554875
Test: mm test-art-host

Merged-In: I2486d2704d74a192f1ecdc02589e569b61efa4ae
Change-Id: I2486d2704d74a192f1ecdc02589e569b61efa4ae
2017-08-03 11:04:11 -07:00
Dmitry Shmidt 55a388d092 Merge "clang: Allow LOCAL_CLANG exception for device/google/contexthub project" am: 138c7baabe am: 800604dc37
am: 86acd08b1a

Change-Id: I3daad22a5f154b212144938a109acfb809a10a81
2017-08-03 16:51:03 +00:00
Dmitry Shmidt 86acd08b1a Merge "clang: Allow LOCAL_CLANG exception for device/google/contexthub project" am: 138c7baabe
am: 800604dc37

Change-Id: I4de90e11061fb75ecc69456fd005a18bded20175
2017-08-03 16:45:33 +00:00
Dmitry Shmidt 800604dc37 Merge "clang: Allow LOCAL_CLANG exception for device/google/contexthub project"
am: 138c7baabe

Change-Id: I5f821a275c744796f654242c05caeea44691f0e3
2017-08-03 16:39:37 +00:00
Treehugger Robot 138c7baabe Merge "clang: Allow LOCAL_CLANG exception for device/google/contexthub project" 2017-08-03 16:31:57 +00:00
Dan Albert 3626b53135 Merge "Add PLATFORM_VERSION_FUTURE_CODENAMES." am: 577ff4730f am: 5ebfa32c53
am: 373d682c69

Change-Id: I28413287340f0206ecea05896da74cce815e7d1f
2017-08-03 02:37:40 +00:00
Dan Albert 373d682c69 Merge "Add PLATFORM_VERSION_FUTURE_CODENAMES." am: 577ff4730f
am: 5ebfa32c53

Change-Id: Ic4abaf6dc95b037858beb969b41b3b52bd057afb
2017-08-03 02:32:40 +00:00
Dan Albert 5ebfa32c53 Merge "Add PLATFORM_VERSION_FUTURE_CODENAMES."
am: 577ff4730f

Change-Id: Ib42278524d19d1a464b9357b78c5fd05e6736e04
2017-08-03 02:27:41 +00:00
Calin Juravle 965f8aec4c Replace -classpath with --class-loader-context for preopt
Use --class-loader-context to pass the context to dex2oat instead of using
runtime arguments.

In preparation to simplify dex2oat handling of contexts.

Bug: 38138251
Test: make & check that the prebuilds have '&' as their classpath key
Change-Id: Iad2fc4364173f59f41886556222ec69f87a0bd52
2017-08-02 17:19:27 -07:00
Dan Albert cd38b86016 Add PLATFORM_VERSION_FUTURE_CODENAMES.
PLATFORM_VERSION_ALL_CODENAMES isn't actually all the code names, just
the ones active in our current target. We need the list of all targets
so we can validate code names in NDK stub templates even if they're in
the future. Unfortunately, all_codenames has been baked into
build.prop for ages, so we're stuck with this name. Improve the
comments and add PLATFORM_VERSION_FUTURE_CODENAMES to cover to cover
the future targets.

Test: make checkbuild
Test: check $ANDROID_PRODUCT_OUT/system/build.prop
Bug: None
Change-Id: I81fed6f761e5362ef3050be9d1e3fb17739feadd
2017-08-02 17:17:41 -07:00
Yifan Hong 64ba249f43 Merge "Vendor modules in make also have __ANDROID_VNDK__ defined." am: 9bd6605abe am: 6dc0978c5f
am: 7f27c8ec0e

Change-Id: I4e72d20d2fc17cd9b125637672b27eb630978e31
2017-08-02 03:54:47 +00:00