Ying Wang d9509e970c resolved conflicts for merge of 133415d5 to master ... Change-Id: Iba6c1dd40e7a4c8058e7100f03296c8f72a2c949		2015-04-08 18:08:46 -07:00
..
clang	resolved conflicts for merge of e04e91b1 to master	2015-04-03 07:43:46 -07:00
combo	am 5432d355: am 7616909b: am 519751a8: Merge "There\'s no such thing as _THREAD_SAFE."	2015-04-03 22:44:06 +00:00
tasks	am 080d2f32: am 2e4c6762: am 2ff6a3bb: Merge "Add explicit dependency on tzdata_updates_intermediates for CTS"	2015-04-01 19:13:29 +00:00
android_manifest.mk	Add support for prebuilt AARs.	2014-12-17 22:27:26 +00:00
apicheck_msg_current.txt	Let apicheck check both the public API and system API.	2015-01-09 14:23:16 -08:00
apicheck_msg_last.txt
base_rules.mk	am 4cbc4b39: am ae61f50a: Support to configure and build multiple custom images.	2015-03-14 00:31:44 +00:00
binary.mk	Rename libnanopb-c-2.8.0 to libprotobuf-c-nano.	2015-04-08 09:54:34 -07:00
build-system.html
build_id.mk	"LKY80"	2015-03-21 06:05:46 -07:00
checktree
cleanbuild.mk	Engage Jack incremental on demand	2015-02-04 11:22:26 +01:00
cleanspec.mk
clear_vars.mk	Merge commit '597cfdb' into merge	2015-03-30 16:42:42 -07:00
config.mk	Ignore ANDROID_JACK_VM_ARGS and ANDROID_JACK_EXTRA_ARGS	2015-04-07 23:43:36 +02:00
config_sanitizers.mk	Add a SANITIZE_HOST flag.	2014-12-05 22:20:37 -08:00
configure_local_jack.mk	Merge "Check values of LOCAL_JACK_ENABLED"	2015-02-23 20:28:30 +00:00
configure_module_stem.mk
copy_headers.mk
cxx_stl_setup.mk	Add unwinder linking to STL setup.	2015-03-31 18:29:23 -07:00
definitions.mk	resolved conflicts for merge of 133415d5 to master	2015-04-08 18:08:46 -07:00
device.mk
dex_preopt.mk	Remove libdvm support from the core build system.	2014-12-16 10:08:00 -08:00
dex_preopt_libart.mk	Store odex files in oat/<isa>/ directory.	2015-03-18 12:41:31 -07:00
dex_preopt_libart_boot.mk	Remove obsolete PRODUCT_DEX_PREOPT_.*_IN_DATA	2014-12-15 22:09:58 -08:00
dex_preopt_odex_install.mk	Build only 64-bit odex for system server jars.	2015-03-10 11:08:05 -07:00
distdir.mk
dpi_specific_apk.mk	Add back Java resources to apk without Java code.	2015-03-27 11:30:51 -07:00
droiddoc.mk	Make modules depend on their makefile.	2014-11-11 14:30:54 -08:00
dumpvar.mk
dynamic_binary.mk	Strip prebuilt shared library by default.	2015-03-13 11:36:15 -07:00
envsetup.mk	am b7fe2e62: am f7683b81: Merge "Clearly explain that 32-bit x86 is not supported"	2015-03-20 22:09:36 +00:00
executable.mk
executable_internal.mk	Use prebuilt libclang_rt.profile.	2015-04-01 19:03:22 -07:00
executable_prefer_symlink.mk	Improved nothing-to-do-build	2015-02-26 18:47:21 -08:00
filter_symbols.sh
find-jdk-tools-jar.sh
help.mk
host_dalvik_java_library.mk	Improved nothing-to-do-build	2015-02-26 18:47:21 -08:00
host_dalvik_static_java_library.mk	Change built module of static java libraries	2015-02-18 22:54:18 +01:00
host_executable.mk
host_executable_internal.mk	Use prebuilt libclang_rt.profile.	2015-04-01 19:03:22 -07:00
host_java_library.mk	Change built module of static java libraries	2015-02-18 22:54:18 +01:00
host_java_library_common.mk	Add the correct dependency when the full version of the protocol buffer library is requested.	2015-03-11 10:14:41 -07:00
host_native_test.mk
host_prebuilt.mk
host_shared_library.mk
host_shared_library_internal.mk	Use prebuilt libclang_rt.profile.	2015-04-01 19:03:22 -07:00
host_shared_test_lib.mk
host_static_library.mk
host_static_library_internal.mk
host_static_test_lib.mk
host_test_internal.mk	Remove logic for libstdc++ gtest libs.	2014-11-09 00:55:25 -08:00
install_jni_libs.mk
install_jni_libs_internal.mk	Support LOCAL_PREBUILT_JNI_LIBS in unbundled build.	2015-02-12 22:40:24 +00:00
java.mk	am ea517854: am aacc8bb4: am 18ecae31: Merge "Convert bc depfiles to .P files."	2015-04-04 01:49:47 +00:00
java_library.mk	Change built module of static java libraries	2015-02-18 22:54:18 +01:00
legacy_prebuilts.mk
main.mk	am 783a632f: am 7f914204: am 55fbc49f: Merge "Change eng builds from interpret-only to verify-at-runtime"	2015-03-23 22:55:28 +00:00
Makefile	resolved conflicts for merge of 133415d5 to master	2015-04-08 18:08:46 -07:00
module_arch_supported.mk
multi_prebuilt.mk	Strip prebuilt shared library by default.	2015-03-13 11:36:15 -07:00
multilib.mk
native_benchmark.mk
native_test.mk
node_fns.mk
notice_files.mk	Change built module of static java libraries	2015-02-18 22:54:18 +01:00
package.mk
package_internal.mk	Add back Java resources to apk without Java code.	2015-03-27 11:30:51 -07:00
pathmap.mk	Add the new audio include path on the list of default includes	2015-04-03 15:09:11 -07:00
pdk_config.mk	Merge "Add required projects to pdk build on master."	2015-03-27 18:16:04 +00:00
phony_package.mk	Make modules depend on their makefile.	2014-11-11 14:30:54 -08:00
post_clean.mk
prebuilt.mk	Don't set up the prebuilt apk rule twice.	2014-12-01 15:56:19 -08:00
prebuilt_internal.mk	Strip prebuilt shared library by default.	2015-03-13 11:36:15 -07:00
process_wrapper.sh
process_wrapper_gdb.cmds
process_wrapper_gdb.sh
product.mk	Add support to sign boot images with vboot.	2015-03-26 17:54:40 +00:00
product_config.mk	am ad6dd21e: Merge "Remove unused PRODUCT_TAGS"	2015-01-06 23:59:10 +00:00
proguard.emma.flags
proguard.flags
proguard_basic_keeps.flags
proguard_tests.flags
root.mk
sdk_font.mk
setup_one_odex.mk
shared_library.mk
shared_library_internal.mk	Use prebuilt libclang_rt.profile.	2015-04-01 19:03:22 -07:00
shared_test_lib.mk
static_java_library.mk	Change built module of static java libraries	2015-02-18 22:54:18 +01:00
static_library.mk
static_library_internal.mk
static_test_lib.mk
target_test_internal.mk	Remove logic for platform stlport gtest.	2014-11-11 17:45:45 -08:00
version_defaults.mk	DO NOT MERGE - Bump version to 5.1.1	2015-03-25 21:04:38 -07:00