platform_build/core
Colin Cross 941b682099 Rearrange java library outputs
Jack can silently handle using a java library as a static java
library by merging in the java library dex file.  This causes
problems when switching to javac, because dex doesn't support
dex merging with multidex enabled?

Make the output files consistent between java libraries and static
java libraries.  Java libraries will now produce:
classes-pre-proguard.jar: the classes before proguard processing
classes.jar: the final jar file containing classes before dexing
javalib.jar: a jar containing classes.dex

Static java libraries will eventually only produce
classes-pre-proguard.jar and classes.jar.  All inter-library
linking is done with classes.jar, so a java library can be
used as a static java library.

There are too many dependencies outside the build system that
expect javalib.jar to exist for static and host java libraries,
so for now continue to build a javalib.jar that is a copy of
classes.jar.

Test: m -j ANDROID_COMPILE_WITH_JACK=false java
Test: m -j java
Bug: 36901093
Change-Id: I6730e2d3ec38004874265b2a690442dec57b33f4
2017-04-05 18:04:37 -07:00
..
clang Switch to clang-3859424. 2017-03-28 22:11:52 -07:00
combo Re-enable dx support 2017-02-16 14:08:45 -08:00
no_java_path Disable java when JAVA_NOT_REQUIRED is set 2016-02-08 17:02:48 -08:00
tasks Revert "device-tests: As a dependency to tests" 2017-03-21 01:00:41 +00:00
LINUX_KERNEL_COPYING build: Add LINUX_KERNEL_COPYING license file 2015-11-09 02:27:01 +01:00
Makefile Don't include the dev-key on IOT products. 2017-04-03 15:04:35 -07:00
WINPTHREADS_COPYING Statically link libwinpthread into windows binaries. 2017-02-23 17:56:44 -08:00
aapt2.mk Add --auto-add-overlay if a module has LOCAL_STATIC_ANDROID_LIBRARIES 2016-03-02 18:55:46 -08:00
android_manifest.mk AAPT2: library resource compilation 2016-02-26 10:44:56 -08:00
apicheck_msg_current.txt
apicheck_msg_last.txt
aux_config.mk Don't run find on directories that don't exist 2017-01-11 23:31:46 +00:00
aux_executable.mk introduce AUX build class of targets 2016-08-02 08:06:28 -07:00
aux_static_library.mk introduce AUX build class of targets 2016-08-02 08:06:28 -07:00
aux_toolchain.mk introduce AUX build class of targets 2016-08-02 08:06:28 -07:00
base_rules.mk Add LOCAL_VENDOR_MODULE as a synonym to LOCAL_PROPRIETARY_MODULE 2017-03-20 20:57:04 -07:00
binary.mk Ensure that BOARD_VNDK_VERSION is current 2017-03-27 22:55:21 -07:00
build-system.html Fix build system documentation example 2016-05-08 19:24:58 -07:00
build_id.mk [DO NOT MERGE] Update BUILD_ID for nyc branches. 2016-03-02 18:18:07 -08:00
build_rro_package.mk Change name of overlay subdir 'sku'->'theme' 2016-10-19 19:11:30 +00:00
ccache.mk ccache: Allow external setting of CCACHE_COMPILERCHECK variable 2016-03-15 19:44:21 +02:00
checktree
cleanbuild.mk Use ifndef or ifeq () instead of ifeq "" 2017-02-21 17:29:10 -08:00
cleanspec.mk
clear_vars.mk Merge "Move comments to the previous line" 2017-03-28 22:27:44 +00:00
config.mk Merge "Revert "Revert "Revert "Add soong_javac_filter to all javac commands"""" 2017-03-30 00:53:06 +00:00
config_sanitizers.mk Blacklist code for CFI. 2017-02-15 12:48:05 -08:00
configure_local_jack.mk Re-enable dx support 2017-02-16 14:08:45 -08:00
configure_module_stem.mk
copy_headers.mk Prohibit host modules from using LOCAL_COPY_HEADERS 2016-11-28 13:46:17 -08:00
cxx_stl_setup.mk Fix building static linux binaries 2016-09-13 17:48:07 +00:00
definitions.mk Rearrange java library outputs 2017-04-05 18:04:37 -07:00
device.mk
dex_preopt.mk Remove option for non-pic dex preopt. 2016-12-19 09:52:25 +00:00
dex_preopt_libart.mk Merge "Add local preopt options for generating app image and profile" 2017-03-03 01:14:03 +00:00
dex_preopt_libart_boot.mk Don't include patch information for dex preopt. 2017-02-28 17:05:12 +00:00
dex_preopt_odex_install.mk Merge "Add LOCAL_VENDOR_MODULE as a synonym to LOCAL_PROPRIETARY_MODULE" 2017-03-21 06:02:14 +00:00
distdir.mk Sort out ANDROID_GOALS, KATI_GOALS and NINJA_GOALS. 2015-11-03 17:10:28 -08:00
dpi_specific_apk.mk Move proguard before classes.jar 2017-04-06 00:46:23 +00:00
droiddoc.mk resolve merge conflicts of dd9aee1 to stage-aosp-master 2016-07-29 14:15:14 -07:00
dumpvar.mk Add TARGET_PLATFORM_VERSION to lunch 2017-03-23 09:44:08 -07:00
dynamic_binary.mk Add NATIVE_TESTS class, move host native tests 2016-05-24 12:43:16 -07:00
envsetup.mk Refactor sanitized library on-disk layout - Make. 2017-03-30 20:14:27 -07:00
executable.mk Record module type statistics 2016-07-29 19:58:35 +00:00
executable_internal.mk Add basic VNDK support in Make 2016-11-28 13:46:17 -08:00
executable_prefer_symlink.mk Remove HOST_PREFER_32_BIT 2016-09-02 13:20:52 -07:00
filter_symbols.sh
find-jdk-tools-jar.sh Error out early on nonstandard JDK directory layouts 2015-10-23 19:00:43 -07:00
fuzz_test.mk Create sub-directory for fuzzers under nativetest. 2016-09-02 13:25:59 -07:00
generate_enforce_rro.mk Enforce RROs for all the build-time ROs 2017-03-30 10:43:38 +09:00
goma.mk goma.mk: do not start goma compiler_proxy if NOSTART_GOMA is set. 2016-09-13 13:13:52 +09:00
header_library.mk Add Header Library support to Make 2017-02-15 16:04:49 -08:00
header_library_internal.mk Add Header Library support to Make 2017-02-15 16:04:49 -08:00
help.mk Add vnod. 2017-03-07 12:17:51 -08:00
host_dalvik_java_library.mk Optimize out extra jar copies 2017-03-30 19:35:15 -07:00
host_dalvik_static_java_library.mk Record module type statistics 2016-07-29 19:58:35 +00:00
host_executable.mk Remove HOST_PREFER_32_BIT 2016-09-02 13:20:52 -07:00
host_executable_internal.mk Add NATIVE_TESTS class, move host native tests 2016-05-24 12:43:16 -07:00
host_fuzz_test.mk Record module type statistics 2016-07-29 19:58:35 +00:00
host_java_library.mk Rearrange java library outputs 2017-04-05 18:04:37 -07:00
host_java_library_common.mk Remove javac support in host dex rules. 2016-03-24 16:48:47 -07:00
host_native_test.mk Record module type statistics 2016-07-29 19:58:35 +00:00
host_prebuilt.mk Record module type statistics 2016-07-29 19:58:35 +00:00
host_shared_library.mk Remove HOST_PREFER_32_BIT 2016-09-02 13:20:52 -07:00
host_shared_library_internal.mk Remove USE_NINJA=false 2016-02-26 21:48:31 -08:00
host_shared_test_lib.mk Finish refactoring tests to NATIVE_TESTS 2016-06-22 00:27:54 -07:00
host_static_library.mk Remove HOST_PREFER_32_BIT 2016-09-02 13:20:52 -07:00
host_static_library_internal.mk
host_static_test_lib.mk Record module type statistics 2016-07-29 19:58:35 +00:00
host_test_internal.mk Support non-gtest NATIVE_TESTS 2016-12-21 20:27:06 -08:00
install_jni_libs.mk
install_jni_libs_internal.mk Build: Skip JNI lib symlink in second-stage build 2016-12-06 17:56:29 -08:00
jack-default.args Changing default Jack arguments. 2017-03-28 12:13:32 +02:00
java.mk Rearrange java library outputs 2017-04-05 18:04:37 -07:00
java_common.mk Rearrange java library outputs 2017-04-05 18:04:37 -07:00
java_library.mk Rearrange java library outputs 2017-04-05 18:04:37 -07:00
local_vndk.mk Add LOCAL_VENDOR_MODULE as a synonym to LOCAL_PROPRIETARY_MODULE 2017-03-20 20:57:04 -07:00
main.mk Use product-based inclusive rule for enforcing RRO 2017-04-04 11:31:24 +09:00
module_arch_supported.mk Tell Soong about HOST_CROSS_* 2016-02-29 13:55:14 -08:00
multi_prebuilt.mk Rearrange java library outputs 2017-04-05 18:04:37 -07:00
multilib.mk
native_benchmark.mk resolve merge conflicts of dd9aee1 to stage-aosp-master 2016-07-29 14:15:14 -07:00
native_test.mk Record module type statistics 2016-07-29 19:58:35 +00:00
ninja_config.mk Fix vendor/google/build/ninja_config.mk 2016-11-10 19:41:27 -08:00
node_fns.mk
notice_files.mk Add Header Library support to Make 2017-02-15 16:04:49 -08:00
package.mk Record module type statistics 2016-07-29 19:58:35 +00:00
package_internal.mk Move proguard before classes.jar 2017-04-06 00:46:23 +00:00
pathmap.mk Update pathmap.mk for renderscript support library migration 2016-12-22 17:32:20 -08:00
pdk_config.mk Replace core-junit with legacy-test 2016-11-30 13:50:56 +00:00
pdk_fusion_modules.mk Add LOCAL_VENDOR_MODULE as a synonym to LOCAL_PROPRIETARY_MODULE 2017-03-20 20:57:04 -07:00
phony_package.mk Record module type statistics 2016-07-29 19:58:35 +00:00
prebuilt.mk Support native test prebuilts for X86+ARM builds 2017-01-17 14:19:50 -08:00
prebuilt_internal.mk Rearrange java library outputs 2017-04-05 18:04:37 -07:00
process_wrapper.sh
process_wrapper_gdb.cmds
process_wrapper_gdb.sh
product-graph.mk Fix "make product-graph" and "make dump-products". 2015-10-28 16:49:44 -07:00
product.mk Use product-based inclusive rule for enforcing RRO 2017-04-04 11:31:24 +09:00
product_config.mk Use product-based inclusive rule for enforcing RRO 2017-04-04 11:31:24 +09:00
proguard.emma.flags
proguard.flags
proguard.jacoco.flags Support code coverage with Jack 2016-01-27 19:14:14 +01:00
proguard_basic_keeps.flags
proguard_tests.flags
root.mk
sdk_font.mk
setup_one_odex.mk Move profile logic to dex_preopt_odex_install 2017-03-03 16:23:14 -08:00
shared_library.mk Record module type statistics 2016-07-29 19:58:35 +00:00
shared_library_internal.mk Support Soong native coverage 2017-02-10 09:27:35 -08:00
shared_test_lib.mk Finish refactoring tests to NATIVE_TESTS 2016-06-22 00:27:54 -07:00
soong_config.mk Expose PLATFORM_VERSION_ALL_CODENAMES to soong. 2017-03-31 13:13:21 -07:00
static_java_library.mk Pass min sdk version to dx and desugar 2017-02-22 11:10:37 -08:00
static_library.mk Record module type statistics 2016-07-29 19:58:35 +00:00
static_library_internal.mk Support Soong native coverage 2017-02-10 09:27:35 -08:00
static_test_lib.mk Record module type statistics 2016-07-29 19:58:35 +00:00
target_test_internal.mk Support non-gtest NATIVE_TESTS 2016-12-21 20:27:06 -08:00
version_defaults.mk Merge "Auto-generate PLATFORM_VERSION_ALL_CODENAMES." 2017-03-31 23:09:42 +00:00