platform_build/core
Ed Heyl b55b07fef7 am e46a061d: am d7e7e482: am d83f3396: Revert "Merge "Switch the required host Java environment to 1.6." into kraken"
Merge commit 'e46a061d08f9667783d39a60106003497c2ad41e'

* commit 'e46a061d08f9667783d39a60106003497c2ad41e':
  Revert "Merge "Switch the required host Java environment to 1.6." into kraken"
2010-06-11 15:30:54 -07:00
..
combo merge from open-source master 2010-06-04 07:56:24 -07:00
tasks resolved conflicts for merge of f83fd362 to master 2010-06-09 11:48:48 -07:00
apicheck_msg_current.txt Update the error message that occurs when current.xml needs regenerating. 2009-05-21 09:27:39 -04:00
apicheck_msg_last.txt auto import from //depot/cupcake/@135843 2009-03-03 19:28:42 -08:00
armelf.x auto import from //branches/cupcake/...@137873 2009-03-11 12:11:54 -07:00
armelf.xsc auto import from //branches/cupcake/...@137873 2009-03-11 12:11:54 -07:00
armelflib.x auto import from //depot/cupcake/@135843 2009-03-03 19:28:42 -08:00
base_rules.mk am a07d37b7: Cherry-pick bug fixes from master. 2010-06-11 09:04:43 -07:00
binary.mk Add FDO options to Android make system. 2009-09-21 16:31:50 -07:00
build-system.html Add support for LOCAL_JAVACFLAGS 2010-02-05 15:57:07 -08:00
build_id.mk set BUILD_ID, do not merge 2009-10-02 08:01:02 -07:00
checktree auto import from //depot/cupcake/@135843 2009-03-03 19:28:42 -08:00
cleanbuild.mk Decentralizes cleanspecs. 2010-03-03 13:08:28 -08:00
cleanspec.mk Adapt to new location of libcore 2010-04-30 13:22:56 -07:00
clear_vars.mk Squashed commit of the following (DO NOT MERGE): 2010-05-18 15:26:22 -07:00
config.mk resolved conflicts for merge of f83fd362 to master 2010-06-09 11:48:48 -07:00
copy_headers.mk auto import from //depot/cupcake/@135843 2009-03-03 19:28:42 -08:00
definitions.mk am 2e684553: am eee01787: am e8ffa149: am ba16a89d: Override LOCAL_CERTIFICATE in inherit-package. 2010-06-02 22:35:33 -07:00
device.mk auto import from //depot/cupcake/@135843 2009-03-03 19:28:42 -08:00
distdir.mk auto import from //depot/cupcake/@135843 2009-03-03 19:28:42 -08:00
droiddoc.mk Adding version information to DroidDoc. Rather than pulling the version from 2009-07-21 18:09:39 -07:00
dynamic_binary.mk Add FDO options to Android make system. 2009-09-21 16:31:50 -07:00
envsetup.mk Support building Windows SDK under Linux. 2010-04-23 13:17:23 -07:00
executable.mk auto import from //depot/cupcake/@135843 2009-03-03 19:28:42 -08:00
filter_symbols.sh auto import from //depot/cupcake/@135843 2009-03-03 19:28:42 -08:00
find-jdk-tools-jar.sh auto import from //depot/cupcake/@135843 2009-03-03 19:28:42 -08:00
host_executable.mk auto import from //depot/cupcake/@135843 2009-03-03 19:28:42 -08:00
host_java_library.mk Add support for LOCAL_JAVACFLAGS 2010-02-05 15:57:07 -08:00
host_prebuilt.mk auto import from //depot/cupcake/@135843 2009-03-03 19:28:42 -08:00
host_shared_library.mk auto import from //depot/cupcake/@135843 2009-03-03 19:28:42 -08:00
host_static_library.mk Make the host static library build rule know about 2009-10-15 16:28:56 -07:00
java.mk Squashed commit of the following (DO NOT MERGE): 2010-05-18 15:26:22 -07:00
java_library.mk auto import from //depot/cupcake/@135843 2009-03-03 19:28:42 -08:00
key_char_map.mk auto import from //depot/cupcake/@135843 2009-03-03 19:28:42 -08:00
main.mk am e46a061d: am d7e7e482: am d83f3396: Revert "Merge "Switch the required host Java environment to 1.6." into kraken" 2010-06-11 15:30:54 -07:00
Makefile Squashed commit of the following (DO NOT MERGE): 2010-05-18 15:26:22 -07:00
multi_prebuilt.mk Build BUILD_MULTI_PREBUILT for the prebuilt target 2010-05-10 14:51:56 -07:00
node_fns.mk fix makefile inheritance system 2010-02-18 12:23:35 -08:00
notice_files.mk Fix the warning about NOTICE files overriding previous targets. 2009-04-13 12:51:43 -04:00
package.mk Unbundle the build system. 2010-06-09 10:26:26 -07:00
pathmap.mk am 876ae91c: am 06df2923: libdrm2 is never used. Remove the reference to it. 2010-05-14 09:36:01 -07:00
prebuilt.mk add "EXTERNAL" as special value of LOCAL_CERTIFICATE 2009-12-15 15:06:55 -08:00
prelink-linux-arm.map am 045fcc72: am ba12575b: Merge "Fix issue 2667796 [Audio Effect Framework] Effect factory and libraries." into kraken 2010-05-24 23:25:35 -07:00
process_wrapper.sh auto import from //depot/cupcake/@135843 2009-03-03 19:28:42 -08:00
process_wrapper_gdb.cmds auto import from //depot/cupcake/@135843 2009-03-03 19:28:42 -08:00
process_wrapper_gdb.sh auto import from //depot/cupcake/@135843 2009-03-03 19:28:42 -08:00
product.mk am b93e03cb: am 52911309: Cherry-pick unbundled build changes from master 2010-06-02 13:11:32 -07:00
product_config.mk am b93e03cb: am 52911309: Cherry-pick unbundled build changes from master 2010-06-02 13:11:32 -07:00
proguard.flags Make ProGuard keep @VisibleForTesting classes and methods 2010-03-09 14:37:21 +00:00
proguard_tests.flags Fix and enable proguard on packages. 2010-02-11 13:41:10 -08:00
raw_executable.mk auto import from //depot/cupcake/@135843 2009-03-03 19:28:42 -08:00
raw_static_library.mk auto import from //depot/cupcake/@135843 2009-03-03 19:28:42 -08:00
root.mk auto import from //depot/cupcake/@135843 2009-03-03 19:28:42 -08:00
shared_library.mk auto import from //depot/cupcake/@135843 2009-03-03 19:28:42 -08:00
static_java_library.mk auto import from //depot/cupcake/@135843 2009-03-03 19:28:42 -08:00
static_library.mk core: Add support for static libraries to include other whole static libs. 2009-05-27 20:14:55 -07:00
version_defaults.mk fix platform name 2010-06-11 02:50:18 -07:00