Commit Graph

34623 Commits

Author SHA1 Message Date
Tobias Thierer 1da1c6d056 Merge "Revert "Build support for 32-bit armv8-a"" 2017-08-22 10:30:29 +00:00
Tobias Thierer 7de79cbeaf Revert "Build support for 32-bit armv8-a"
This reverts commit 0daa78eef4.

Reason for revert: Broke the build for some targets (including marlin and angler).

$ make cts
build/core/combo/TARGET_linux-arm.mk:43: kryo is armv8-a.
build/core/combo/TARGET_linux-arm.mk:45: TARGET_2ND_ARCH_VARIANT, armv7-a-neon, ignored! Use armv8-a instead.
[...]
cts/tests/tests/os/jni/android_os_cts_CpuInstructions.cpp:88:20: error: instruction requires: armv7 or earlier
    asm volatile ( "swp r0, r0, [%0]" : "+r"(ptr) : : "r0" );
                   ^
<inline asm>:1:2: note: instantiated into assembly here
        swp r0, r0, [r1]
        ^

Change-Id: I65a91ed5a4461eca6646df13642a87a5c37d6c85
2017-08-21 15:03:16 +00:00
Isaac Chen 70fe80491c Merge "Build support for 32-bit armv8-a" 2017-08-19 06:10:56 +00:00
Jeff Gaston 30928b0c6f Merge "Revert "Revert "Use the Finder's results for faster searching""" 2017-08-18 19:21:38 +00:00
Treehugger Robot 9b18ed094c Merge "cxx_stl_setup is not executed for modules from soong" 2017-08-18 07:11:41 +00:00
Jiyong Park 425d489cb9 cxx_stl_setup is not executed for modules from soong
cxx_stl_setup is adding libunwind_llvm to the dependency even for
modules from soong. However, since this dependency was already handled
in soong, those modules don't need to go through it again.

Bug: 64815735
Test: BOARD_VNDK_VERSION=current mma -j (under /hardware/libhardware)

Change-Id: Id6e2547c752ec831aa56a14c0bf4db0a55d51243
2017-08-18 13:46:04 +09:00
Jeff Gaston d05050ee9c Revert "Revert "Use the Finder's results for faster searching""
This reverts commit 6f2aea5636.

Reason for revert: Fix went in ( I70b08023b94b5789dc8394651bbac4c49c82787f ); trying again to use this

Change-Id: I0f58c21a7312dda01980d338401e756f610fe3b4
2017-08-18 02:46:39 +00:00
Treehugger Robot 22b45d401a Merge "Use the min sdk version from soong." 2017-08-18 02:34:36 +00:00
Dan Albert 105e4fe0a6 Use the min sdk version from soong.
Test: make checkbuild
Bug: None
Change-Id: I0306803cebf98748503b7e217db0f0f5959bf4f7
2017-08-17 16:37:49 -07:00
Treehugger Robot f759166bb8 Merge "Fix typo when building aar" 2017-08-17 22:22:09 +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 2d71b221cb Merge "Use the Finder's results for faster searching" 2017-08-17 19:40:56 +00:00
Colin Cross 4a5458aed1 Fix typo when building aar
I7dced6acbe621a60cd49daf17872941485602732 introduced a typo,
fix (dir $@) to $(dir $@).

Bug: 64634025
Test: m -j on affected target
Change-Id: Ic7181631630662970337c542b73cd0de6f3f995f
2017-08-17 06:44:23 +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 05ecd66557 Merge "Fix log spam in unzip-jar-files" 2017-08-16 09:54:46 +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 24678e9469 Merge "Add com.android.location.provider to the system server classpath." 2017-08-15 07:32:10 +00: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 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 5ae6434575 Merge "Omit module-info.class when unzipping jar files." 2017-08-11 13:05:02 +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
Isaac Chen 0daa78eef4 Build support for 32-bit armv8-a
Overwrite TARGET_(2ND_)ARCH_VARIANT as armv8-a if
TARGET_(2ND_)CPU_VARIANT is set to some known armv8-a core like
cortex-a53, cortex-a73, kryo, denver64 etc.

For clang, -march is ignored if -mcpu is set to specific core so this
change doen't impact the objects built for armv7-a-neon/some_armv8_core
since it's treated as armv8-a/some_armv8_core.

Bug: 62895439
Test: Built modified aosp_arm64 with armv8-a as its TARGET_2ND_CPU_ARCH
      and generic as its TARGET_2ND_CPU_VARIANT successfully.
      "lunch hikey-userdebug; make" and verify TARGET_2ND_ARCH_VARIANT
      is overwritten.

Change-Id: If4260cf397783b5f56c4fd432615f4676429a1d3
2017-08-10 16:13:22 +08: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 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
Treehugger Robot 374f753211 Merge "logcat: permit transition to Android.bp" 2017-08-08 23:06:25 +00:00
Treehugger Robot 9758900b56 Merge "Fix the typo: "desugar-classpath" to "desugar-bootclasspath"" 2017-08-08 23:01:47 +00:00
Mark Salyzyn 719790f4d4 logcat: permit transition to Android.bp
Permit transition of logcat to Android.bp by moving the debug
target logpersist.start to the PRODUCT_PACKAGES_DEBUG list.

Test: compile
Change-Id: I6cfd4c40f848a2ff2661e3692fa8cd69ed99e8c9
2017-08-08 14:24:55 -07: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
Treehugger Robot e1963e2511 Merge "Fix the build when using findleaves.py" 2017-08-08 19:00:51 +00:00
Dan Willemsen 34626e5386 Fix the build when using findleaves.py
This doesn't seem to affect the Kati emulation (at least on Linux), but
findleaves.py on both Mac and Linux checks for duplicate files (via
inode) and only emits build/{target,tools}/Android.mk instead of that
and build/make/{target,tools}/Android.mk.

Bug: 64397960
Test: build/tools/findleaves.py --prune=.git --prune=.repo --dir=.  Android.mk
Test: m -j signapk
Change-Id: Ie6219a809e403e6cc9371b5c0370c7925a592a0d
2017-08-08 09:45:12 -07:00
Jeff Gaston 6ab53d7211 Merge "Remove the need to find Android.mk files via directory symlinks" 2017-08-08 00:05:09 +00:00
Jeff Gaston 5c1f3fd068 Remove the need to find Android.mk files via directory symlinks
Bug: 64397960
Test: m -j
Change-Id: I5b77dd654dfced63900913c447b5448b632158d7
2017-08-07 14:21:20 -07:00
Treehugger Robot 5848fedea8 Merge "Add dirty-images-objects handling to boot image build." 2017-08-05 00:55:48 +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 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
Treehugger Robot 138c7baabe Merge "clang: Allow LOCAL_CLANG exception for device/google/contexthub project" 2017-08-03 16:31:57 +00:00
Treehugger Robot 577ff4730f Merge "Add PLATFORM_VERSION_FUTURE_CODENAMES." 2017-08-03 02:21:27 +00:00