p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
15,088 Commits 1 Branch 0 Tags 68 MiB
Commit Graph

3728 Commits

Author SHA1 Message Date
Ying Wang ebbec848be am 23752157: am 3beb831c: Merge "Make sure to install the .odex when running "make <module_name>"" 
* commit '23752157bc4b28b431f04e2b040db55aba404fb8':
  Make sure to install the .odex when running "make <module_name>"
 2014-01-24 21:50:13 +00:00
Ying Wang fbb8b629be am 746d1f73: am 9e21bcdc: Merge "Support to build executables for TARGET_2ND_ARCH" 
* commit '746d1f732f4d933addb08d5039095edb07f56f84':
  Support to build executables for TARGET_2ND_ARCH
 2014-01-24 21:50:12 +00:00
Ying Wang 2ca5c75ba1 am 443c9dc8: am c236e00e: am 7da9740a: Merge "Replace all references to LOCAL_GENERATED_SOURCES with my_generated_sources" 
* commit '443c9dc818e6f0db222b2a34962eafde4ff22991':
  Replace all references to LOCAL_GENERATED_SOURCES with my_generated_sources
 2014-01-24 21:48:09 +00:00
Ying Wang c3536bff2c am 778c138b: am 52afa28f: am a07de328: Merge "Set up rules to build shared libraries for TARGET_2ND_ARCH" 
* commit '778c138b257a3daf2c1ca921abe0843129a96bf5':
  Set up rules to build shared libraries for TARGET_2ND_ARCH
 2014-01-24 21:48:08 +00:00
Ying Wang 0a70ec8e6f am 095bc78e: am 382ad032: am e7345edc: Merge "Set up rules to build static libraries for TARGET_2ND_ARCH" 
* commit '095bc78ed503d031901dbe0770e48920169ece18':
  Set up rules to build static libraries for TARGET_2ND_ARCH
 2014-01-24 21:48:07 +00:00
Ying Wang ab4408a950 am add64250: am d6c4fcab: am 732bdb28: Merge "Load compiler environment for a second arch." 
* commit 'add64250b230a859610d5a157a03adf85cb128c5':
  Load compiler environment for a second arch.
 2014-01-24 21:48:06 +00:00
Ying Wang 4e08d3049b am f2044b41: Merge "build: use arm kernel headers for arm 2nd arch builds" 
* commit 'f2044b41cf11e584ab5df87b6a11f04ae26c6865':
  build: use arm kernel headers for arm 2nd arch builds
 2014-01-24 13:46:57 -08:00
Ying Wang 0c09d5b2ab am e778ec89: Merge "Support arch-specific LOCAL_ variables" 
* commit 'e778ec89fd249e15608b7629963619d99e8a34bf':
  Support arch-specific LOCAL_ variables
 2014-01-24 13:46:56 -08:00
Ying Wang 23752157bc am 3beb831c: Merge "Make sure to install the .odex when running "make <module_name>"" 
* commit '3beb831c79b6051e881d17979981a846259bcd99':
  Make sure to install the .odex when running "make <module_name>"
 2014-01-24 13:46:55 -08:00
Ying Wang 746d1f732f am 9e21bcdc: Merge "Support to build executables for TARGET_2ND_ARCH" 
* commit '9e21bcdc880e1769a4abe31836884f69752fc35e':
  Support to build executables for TARGET_2ND_ARCH
 2014-01-24 13:46:55 -08:00
Ying Wang 443c9dc818 am c236e00e: am 7da9740a: Merge "Replace all references to LOCAL_GENERATED_SOURCES with my_generated_sources" 
* commit 'c236e00e88d2d8487327ef078e50ab1a9c102981':
  Replace all references to LOCAL_GENERATED_SOURCES with my_generated_sources
 2014-01-24 21:45:42 +00:00
Ying Wang 778c138b25 am 52afa28f: am a07de328: Merge "Set up rules to build shared libraries for TARGET_2ND_ARCH" 
* commit '52afa28f315a3ad5a8dffb3c98df5e77e579e529':
  Set up rules to build shared libraries for TARGET_2ND_ARCH
 2014-01-24 21:45:41 +00:00
Ying Wang 095bc78ed5 am 382ad032: am e7345edc: Merge "Set up rules to build static libraries for TARGET_2ND_ARCH" 
* commit '382ad032cbe807a84e799033d15b31d86c12c5cd':
  Set up rules to build static libraries for TARGET_2ND_ARCH
 2014-01-24 21:45:40 +00:00
Ying Wang add64250b2 am d6c4fcab: am 732bdb28: Merge "Load compiler environment for a second arch." 
* commit 'd6c4fcabf6b132927f6980569427f9475a403ed3':
  Load compiler environment for a second arch.
 2014-01-24 21:45:40 +00:00
Colin Cross b34911cadf build: print module that has unhandled install path 
Print the name of the module that is providing an unhandled install
path.

Change-Id: I0e8b02f01de1dde715f0985034ad943f793218ba

Conflicts:
	core/base_rules.mk
 2014-01-24 13:44:11 -08:00
Ying Wang c236e00e88 am 7da9740a: Merge "Replace all references to LOCAL_GENERATED_SOURCES with my_generated_sources" 
* commit '7da9740acdf30356512bea414d4af6efd6db3e40':
  Replace all references to LOCAL_GENERATED_SOURCES with my_generated_sources
 2014-01-24 13:43:31 -08:00
Ying Wang 52afa28f31 am a07de328: Merge "Set up rules to build shared libraries for TARGET_2ND_ARCH" 
* commit 'a07de328e0557068f2503ed0aa20ddc684ed1c40':
  Set up rules to build shared libraries for TARGET_2ND_ARCH
 2014-01-24 13:43:30 -08:00
Ying Wang 382ad032cb am e7345edc: Merge "Set up rules to build static libraries for TARGET_2ND_ARCH" 
* commit 'e7345edc1100ffd33e6434b0edc9d3b0f09d5c94':
  Set up rules to build static libraries for TARGET_2ND_ARCH
 2014-01-24 13:43:29 -08:00
Ying Wang d6c4fcabf6 am 732bdb28: Merge "Load compiler environment for a second arch." 
* commit '732bdb28f2e39cf97b22271481b2249b22add87f':
  Load compiler environment for a second arch.
 2014-01-24 13:43:29 -08:00
Colin Cross 6e087a339b build: use correct arm vs thumb arguments for 2nd arch builds 
Set arm_objects_mode and normal_objects_mode when building a
module for arm when it is the 2nd arch.

Change-Id: I5f7df519b6e1dde6cbf92d106681f07a58e1f1f2
 2014-01-24 13:42:01 -08:00
Colin Cross c3256c770d build: use arm kernel headers for arm 2nd arch builds 
Compiling for arm requires using the arm kernel headers and not
the aarch64 kernel headers.  Add $(combo_2nd_arch_prefix) to get
asm-$(TARGET_2ND_ARCH) when arm is the 2nd arch.

Change-Id: I15270d0ef35e48c034bf4d0d5e35b76f67b2a8e1
 2014-01-24 13:41:00 -08:00
Ying Wang b8e0185489 Support arch-specific LOCAL_ variables 
With those variables, you can set up different values for TARGET_ARCH
and TARGET_2ND_ARCH.
Also fixed a couple of variables.

Bug: 11654773
Change-Id: I4c7684a562cd5877d18f67d4f848b8df07d0103b

Conflicts:
	core/base_rules.mk
 2014-01-24 13:38:34 -08:00
Ying Wang 5c7fed28f2 Make sure to install the .odex when running "make <module_name>" 
Change-Id: I64195294dad15b7d379d667f4c4738c2808fd384
 2014-01-24 13:37:11 -08:00
Ying Wang dd814bf8c2 Support to build executables for TARGET_2ND_ARCH 
By default, an executable is built for TARGET_ARCH.
To build it for TARGET_2ND_ARCH in a 64bit product, use:
LOCAL_32BIT_ONLY := true
To skip a module for TARGET_2ND_ARCH, use:
LOCAL_NO_2ND_ARCH := true

Bug: 11654773
Change-Id: Ieb293d25b21024bfe1b554044df338e064ac7b46
 2014-01-24 13:36:30 -08:00
Ying Wang ec6d6262ac Replace all references to LOCAL_GENERATED_SOURCES with my_generated_sources 
Now the RS generated sources are only appended to my_generated_sources.

Bug: 11654773
Change-Id: If8dbf3c08fed0b9945dd32b8c809331c17c4bc85
 2014-01-24 13:35:47 -08:00
Ying Wang 4d2cc665ea Set up rules to build shared libraries for TARGET_2ND_ARCH 
The rules for the 2nd arch are set up in the second inclusion
of shared_library_internal.mk.
Intermediate fils of libfoo of the 2nd arch will be built into
$(PRODUCT_OUT)/obj_$(TARGET_2ND_ARCH)/SHARED_LIBRARIES/libfoo_intermediates/
and the built libfoo.so will be in
$(PRODUCT_OUT)/obj_$(TARGET_2ND_ARCH)/lib.

Bug: 11654773
Change-Id: I58bbe5a05a65f63bce6279131552f3792000716e
 2014-01-24 13:35:30 -08:00
Ying Wang 6ef6519170 Set up rules to build static libraries for TARGET_2ND_ARCH 
The rules for the 2nd arch are set up in the second inclusion
of static_library_internal.mk.
libfoo of the 2nd arch will be built into
$(PRODUCT_OUT)/obj_$(TARGET_2ND_ARCH)/libfoo_intermediates/libfoo.a.

Bug: 11654773
Change-Id: I1d92733968fc442e9225b4df5bd1b551a81d89f7
 2014-01-24 13:35:09 -08:00
Ying Wang 1d274d2686 Load compiler environment for a second arch. 
This is the first step to build 32-bit libraries in a 64-bit product.
It will work like this:
1) In the product's BoardConfig.mk, define:
TARGET_2ND_ARCH, TARGET_2ND_ARCH_VARIANT, TARGET_2ND_CPU_VARIANT.
The build system uses those variables to set up an additional compiler
environment for the second arch.

2) When parsing Android.mks, the build system sets up rules to build a
module for both the 1st arch and the 2nd arch, unless it's explicitly
asked to skip so.
Android.mk will be adapted if there is additional rule of generating
source files.
The build system will accept arch-specific LOCAL_ variables, such as
LOCAL_CFLAGS_arm, LOCAL_CFLAGS_armv7-a-neon, LOCAL_CFLAGS_cortex-a15,
LOCAL_CFLAGS_aarch64 etc. Modules use such variables to set up build for
various archs at the same time.

3) Install binary of the 2nd arch by adding "<module_name>:32" to
PRODUCT_PACKAGES. All 2nd-arch libraries linked in by "<module_name>:32"
will be installed automatically.

Bug: 11654773
Change-Id: I2df63cd5463a07bf5358bee2a109f8fb9590fe30

Conflicts:
	core/combo/TARGET_linux-arm.mk
 2014-01-24 13:34:26 -08:00
Colin Cross de89397b16 am 5119fcfc: am f81cc531: am d5227a83: Merge "build: rename aarch64 target to arm64" 
* commit '5119fcfc2052e9f3a5d4415759fb5bf252d651e8':
  build: rename aarch64 target to arm64
 2014-01-24 20:48:20 +00:00
Colin Cross 5119fcfc20 am f81cc531: am d5227a83: Merge "build: rename aarch64 target to arm64" 
* commit 'f81cc531b41617b91ef2c46b7f2fb1bf1abb8dc7':
  build: rename aarch64 target to arm64
 2014-01-24 20:45:41 +00:00
Colin Cross f81cc531b4 am d5227a83: Merge "build: rename aarch64 target to arm64" 
* commit 'd5227a833cde624532ec34e8b25c29af001e427f':
  build: rename aarch64 target to arm64
 2014-01-24 12:42:35 -08:00
Colin Cross 4f0eb7d50c build: rename aarch64 target to arm64 
Rename aarch64 build targets to arm64.  The gcc toolchain is still
aarch64.

Change-Id: Ia92d8a50824e5329cf00fd6f4f92eae112b7f3a3
 2014-01-23 22:39:38 -08:00
Ying Wang 4a814d0a69 am a0d68280: am f5db4548: am 62043de3: Merge "Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."" 
* commit 'a0d68280cae16645c2f16aeb6d8f614b76ba94a0':
  Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."
 2014-01-22 04:03:13 +00:00
Ying Wang a0d68280ca am f5db4548: am 62043de3: Merge "Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."" 
* commit 'f5db454865c7b8cff22cc8faaeb5b983f059cb73':
  Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."
 2014-01-22 04:00:19 +00:00
Ying Wang f5db454865 am 62043de3: Merge "Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."" 
* commit '62043de346dff2d31c58bc8c002699fc74d1351c':
  Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."
 2014-01-21 19:57:41 -08:00
Ying Wang 62043de346 Merge "Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."" 2014-01-22 03:48:59 +00:00
Ying Wang 06b3255118 Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES." 
This reverts commit ca37190711.

Change-Id: I3a76f4cdf92ecbe3059bf5856cf341874e1393cf
 2014-01-22 03:48:27 +00:00
Ying Wang 6e8e82ea58 am 10515519: am 70cc8553: am 8d1f91fa: Merge "Fix filter rule when checking for apks in PRODUCT_COPY_FILES." 
* commit '10515519ee2a3eb50ef3c6054504972fa1bc1e00':
  Fix filter rule when checking for apks in PRODUCT_COPY_FILES.
 2014-01-21 20:41:21 +00:00
Ying Wang 10515519ee am 70cc8553: am 8d1f91fa: Merge "Fix filter rule when checking for apks in PRODUCT_COPY_FILES." 
* commit '70cc85533dacfaa499f39c417cfd78e3ed922414':
  Fix filter rule when checking for apks in PRODUCT_COPY_FILES.
 2014-01-21 20:37:50 +00:00
Ying Wang 70cc85533d am 8d1f91fa: Merge "Fix filter rule when checking for apks in PRODUCT_COPY_FILES." 
* commit '8d1f91fa548c80357fffbdbdd5dcccc3c461c9ec':
  Fix filter rule when checking for apks in PRODUCT_COPY_FILES.
 2014-01-21 12:36:33 -08:00
Ying Wang 8d1f91fa54 Merge "Fix filter rule when checking for apks in PRODUCT_COPY_FILES." 2014-01-21 20:31:31 +00:00
Ying Wang 5f95f44268 am 20048318: am aa754868: am 6ec35451: Merge "Add missing paren in "java -version" check" 
* commit '20048318cda49fc9412be8fb2349354313090240':
  Add missing paren in "java -version" check
 2014-01-21 20:01:29 +00:00
Ying Wang 20048318cd am aa754868: am 6ec35451: Merge "Add missing paren in "java -version" check" 
* commit 'aa7548683bcd254e50cffc5baf00994e58919d64':
  Add missing paren in "java -version" check
 2014-01-21 19:58:09 +00:00
Ying Wang aa7548683b am 6ec35451: Merge "Add missing paren in "java -version" check" 
* commit '6ec3545158f49f521c53c9474cfb28c1a1811fd3':
  Add missing paren in "java -version" check
 2014-01-21 11:54:58 -08:00
Brian Carlstrom 0cf57dc99f Add missing paren in "java -version" check 
Change-Id: Id66e795423e8d25b48ac996956748a93060ea5db
 2014-01-20 23:48:45 -08:00
Robert Craig ca37190711 Fix filter rule when checking for apks in PRODUCT_COPY_FILES. 
PRODUCT_COPY_FILES entries can include the src:dest:owner
syntax versus src:dest. This causes the filter to miss
certain cases. Instead use the word-colon function to
grab the dest regardless of syntax.

Change-Id: I1f4e57a236c1db148bada0cfe5bd1e87bb1194d6
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
 2014-01-17 09:13:50 -05:00
Chet Haase 585ce19d9d Add recyclerview to support libs docs 
Change-Id: Ibe863e4b1930670353e6e0658fbc83e694dec3a4
 2014-01-16 15:55:56 +00:00
Ying Wang da9ef76b5d am a296a71e: am 166bc090: Merge "[MIPS] Reenable linker fatal-warnings" 
* commit 'a296a71e0c344e95f2d4dfe59d850a55130fe58a':
  [MIPS] Reenable linker fatal-warnings
 2014-01-16 01:11:15 +00:00
Ying Wang a296a71e0c am 166bc090: Merge "[MIPS] Reenable linker fatal-warnings" 
* commit '166bc090ab0ac7ac7a620889fd96656be4ca69c1':
  [MIPS] Reenable linker fatal-warnings
 2014-01-15 17:08:22 -08:00
Chris Dearman 13eb1eb53d [MIPS] Reenable linker fatal-warnings 
Change-Id: I4efbb7d0b1026b49a9b8bf968dd4752fca8a543b
 2014-01-15 19:00:37 +00:00
Ying Wang c4f4a5325f am 14af5526: am c4c71f06: Merge "Remove aprof support from the build system." 
* commit '14af5526b5001431af49e40be049b5475de64f15':
  Remove aprof support from the build system.
 2014-01-14 23:42:33 +00:00
Ying Wang 14af5526b5 am c4c71f06: Merge "Remove aprof support from the build system." 
* commit 'c4c71f06ab002c4b12042ba7752272311b62b0f9':
  Remove aprof support from the build system.
 2014-01-14 15:36:57 -08:00
Ying Wang 4587455075 Remove aprof support from the build system. 
This reverts the commit 70dc3e1d.

Change-Id: I480b005579805d2608d05dac41e32bb44642e813
 2014-01-14 14:26:05 -08:00
Ying Wang adc66128dc am b6c57051: am f5ce4fa9: Merge "Install 64-bit libraries to /system/lib64." 
* commit 'b6c570510aa1d2747538fe734292873ed13f5b67':
  Install 64-bit libraries to /system/lib64.
 2014-01-14 20:10:16 +00:00
Ying Wang b6c570510a am f5ce4fa9: Merge "Install 64-bit libraries to /system/lib64." 
* commit 'f5ce4fa983f08d42bbc5d96af4f86bce5c190f0c':
  Install 64-bit libraries to /system/lib64.
 2014-01-14 12:08:32 -08:00
Ying Wang c634974d37 Install 64-bit libraries to /system/lib64. 
/system/lib always contains 32-bit libraries, and /system/lib64 (if
present) always contains 64-bit libraries.
Move things around a little bit, so TARGET_ARCH can be used to define
the build paths.

Bug: 11654773
Change-Id: I2edd91e162c7a20d7719d7bae15e5fa6c2a5b498
 2014-01-13 16:20:31 -08:00
Elliott Hughes 538009b26c am dda9d8ee: am 37c699c2: Merge "Remove obsolete CUSTOM_KERNEL_HEADERS." 
* commit 'dda9d8ee0fe580d663a4eaed49be5d39c3de2882':
  Remove obsolete CUSTOM_KERNEL_HEADERS.
 2014-01-11 00:50:44 +00:00
Elliott Hughes dda9d8ee0f am 37c699c2: Merge "Remove obsolete CUSTOM_KERNEL_HEADERS." 
* commit '37c699c28a464561b186ab11a5af60214ae25d9a':
  Remove obsolete CUSTOM_KERNEL_HEADERS.
 2014-01-10 16:47:30 -08:00
Elliott Hughes 37c699c28a Merge "Remove obsolete CUSTOM_KERNEL_HEADERS." 2014-01-11 00:41:25 +00:00
Elliott Hughes dddb566eba Remove obsolete CUSTOM_KERNEL_HEADERS. 
Change-Id: Id260dd351b90f065eee56e231d4c341b18c1b27f
 2014-01-10 16:35:08 -08:00
Ying Wang ee2a10eb18 am 0650d4a2: am 987616ed: Merge "Fix x86_64 build" 
* commit '0650d4a2eadc96577b2e03fbda000ed5a340d8ac':
  Fix x86_64 build
 2014-01-10 17:40:26 +00:00
Ying Wang 0650d4a2ea am 987616ed: Merge "Fix x86_64 build" 
* commit '987616ed09adc65e6636f7a3a82fa7b38021b6e2':
  Fix x86_64 build
 2014-01-10 09:38:13 -08:00
Pavel Chupin 522b0a633c Fix x86_64 build 
Issue introduced here:
https://android-review.googlesource.com/#/c/71842/

Change-Id: I8a60641ff07173fcedf259df89aaaa4bc6d6ea3e
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
 2014-01-10 19:23:08 +04:00
Brian Carlstrom 1df8d17911 am 98c72521: am ad8271a8: Merge "Add support for ALTERNATE_JAVAC" 
* commit '98c7252113ad4adfc11bb500d737b96c0544106f':
  Add support for ALTERNATE_JAVAC
 2014-01-10 02:39:02 +00:00
Brian Carlstrom 98c7252113 am ad8271a8: Merge "Add support for ALTERNATE_JAVAC" 
* commit 'ad8271a8e6a1f050c1852d6dc3df0eb6777e5606':
  Add support for ALTERNATE_JAVAC
 2014-01-09 18:36:22 -08:00
Brian Carlstrom ad8271a8e6 Merge "Add support for ALTERNATE_JAVAC" 2014-01-10 02:31:26 +00:00
Ying Wang 02e4bb6b10 am cb5f9a28: am a26ea82e: Merge "Define PRIVATE_TARGET_ variables for only target modules." 
* commit 'cb5f9a282e713096104e9d7b18bb028f926dbd2a':
  Define PRIVATE_TARGET_ variables for only target modules.
 2014-01-10 00:34:56 +00:00
Ying Wang cb5f9a282e am a26ea82e: Merge "Define PRIVATE_TARGET_ variables for only target modules." 
* commit 'a26ea82e6a226575f19fec6b5bea111cbe20c233':
  Define PRIVATE_TARGET_ variables for only target modules.
 2014-01-09 16:32:07 -08:00
Brian Carlstrom b6dcef8777 Add support for ALTERNATE_JAVAC 
Bug: 12476356
Change-Id: Idd013031dc32a560bca76cca295bedcad55982b4
 2014-01-09 15:33:23 -08:00
Ying Wang 7fff9a1a56 Define PRIVATE_TARGET_ variables for only target modules. 
Change-Id: I12c54bfffd9acb78a61d1032a087a0edaf3bf12c
 2014-01-09 14:39:41 -08:00
Ying Wang fb5ae89fea am b5fb7f24: am aed49987: Merge "Allow clang to build host binaries." 
* commit 'b5fb7f242e925f482557227623120f1e4480beba':
  Allow clang to build host binaries.
 2014-01-09 19:00:15 +00:00
Ying Wang b5fb7f242e am aed49987: Merge "Allow clang to build host binaries." 
* commit 'aed499879210c7432c1c5b3869f383b27b17dafc':
  Allow clang to build host binaries.
 2014-01-09 10:57:03 -08:00
Ying Wang aed4998792 Merge "Allow clang to build host binaries." 2014-01-09 18:52:06 +00:00
Ying Wang 83709a21c1 am 95fc1a50: am f12d4810: Merge "PRODUCT_BOOT_JARS as a list of jar names separated by space" 
* commit '95fc1a50750f8d0341e10f7ea39d37e3af5b21f3':
  PRODUCT_BOOT_JARS as a list of jar names separated by space
 2014-01-08 00:53:31 +00:00
Ying Wang 95fc1a5075 am f12d4810: Merge "PRODUCT_BOOT_JARS as a list of jar names separated by space" 
* commit 'f12d48104ba782d877afc31a081748fdc881f2b6':
  PRODUCT_BOOT_JARS as a list of jar names separated by space
 2014-01-07 16:50:49 -08:00
Ying Wang ad6674cd60 PRODUCT_BOOT_JARS as a list of jar names separated by space 
This makes it easier for OEMs to extend the PRODUCT_BOOT_JARS in their
product configuration files.

Change-Id: I5feca2f808b1914c275f28c7a4c38cca2ba6851f
 2014-01-07 14:31:49 -08:00
Logan Chien e6f65438a4 Allow clang to build host binaries. 
Change-Id: I7e4f9dc6f69a97cfefdfa2ed55c5d7b8ad496da7
 2014-01-07 14:49:20 +08:00
Ying Wang b86c34ae64 am f05eecc3: am a47d12e3: Merge "Remove LOCAL_SRC_FILES as precondition of enabling dexpreopt" 
* commit 'f05eecc3682d3599906e2ff61209e5c191cbf29b':
  Remove LOCAL_SRC_FILES as precondition of enabling dexpreopt
 2014-01-04 02:02:39 +00:00
Ying Wang f05eecc368 am a47d12e3: Merge "Remove LOCAL_SRC_FILES as precondition of enabling dexpreopt" 
* commit 'a47d12e38ae38a6fdceb54172490c94408efa0de':
  Remove LOCAL_SRC_FILES as precondition of enabling dexpreopt
 2014-01-03 17:59:59 -08:00
Ying Wang 9db168ca5c Remove LOCAL_SRC_FILES as precondition of enabling dexpreopt 
Because a library or app can be built from mere static libraries,
or generated java files. For example, framework is built from only
static library framework-base but without LOCAL_SRC_FILES.
Also added framework2 to PRODUCT_PACKAGES.
Previously framework2.jar was installed by dependency explicitly
established in frameworks/base/Android.mk. That's not enough for the
.odex file.
This fixed the boot failure reported in bug 12382916.

Bug: 12382916
Change-Id: If1a70261ab2bb7fef77cf7b7b995bdc029be0fc3
 2014-01-03 17:53:00 -08:00
Michael Runge a8e325788c am 41e19a4c: am 6b55f007: am facd992e: Makefile used spaces instead of a tab 
* commit '41e19a4cf0f10740aa3437b1c2365e49d4f15181':
  Makefile used spaces instead of a tab
 2013-12-26 23:37:45 +00:00
Michael Runge d961b7d083 am 5636d07a: am a80542db: am 4038aa8f: Enabled incrementals to patch + rename moved files 
* commit '5636d07a29108c77e6b8d38d96b0a1af3bae53ec':
  Enabled incrementals to patch + rename moved files
 2013-12-26 23:37:44 +00:00
Michael Runge 41e19a4cf0 am 6b55f007: am facd992e: Makefile used spaces instead of a tab 
* commit '6b55f00762c03b3625862b89f704090f58f970e7':
  Makefile used spaces instead of a tab
 2013-12-26 15:33:32 -08:00
Michael Runge 5636d07a29 am a80542db: am 4038aa8f: Enabled incrementals to patch + rename moved files 
* commit 'a80542dbf4f193c59525b8749871bcdf4ae4283a':
  Enabled incrementals to patch + rename moved files
 2013-12-26 15:33:27 -08:00
Elliott Hughes b986ad2a1c am 9464ca1b: am b8559790: Merge "Remove a non-existent directory from the include path." 
* commit '9464ca1b97ace55f97c44e3362033fd31de33495':
  Remove a non-existent directory from the include path.
 2013-12-21 00:00:51 +00:00
Elliott Hughes 9464ca1b97 am b8559790: Merge "Remove a non-existent directory from the include path." 
* commit 'b8559790d43f2483c7910e87e33ceebeb40e9bec':
  Remove a non-existent directory from the include path.
 2013-12-20 15:57:57 -08:00
Elliott Hughes 26990f5573 Remove a non-existent directory from the include path. 
Brings aarch64 in line with the other architectures.

Change-Id: Iba3fd33e34e3b5bc071f55cfe09de9e55a023cf7
 2013-12-20 15:37:55 -08:00
Michael Runge 6b55f00762 am facd992e: Makefile used spaces instead of a tab 
* commit 'facd992ec73de763cfbca32dd6aa38ff76a07613':
  Makefile used spaces instead of a tab
 2013-12-20 12:36:49 -08:00
Michael Runge facd992ec7 Makefile used spaces instead of a tab 
Change-Id: Ia34f80d99062ef2899527f11d7bf72e78c63e31c
 2013-12-20 11:50:16 -08:00
Michael Runge a80542dbf4 am 4038aa8f: Enabled incrementals to patch + rename moved files 
* commit '4038aa8fff8c68733bff8b55d8c8d1b59713ca37':
  Enabled incrementals to patch + rename moved files
 2013-12-20 11:35:07 -08:00
Woody Lin dcefbfde3f Add `htc' to `_vendor_owner_whitelist' 
Change-Id: I92bfc8d41d102f687fd8a5b632be3c01c2d005fd
Signed-off-by: Woody Lin <woody_lin@htc.com>
 2013-12-19 15:08:35 -08:00
Colin Cross 20f04df825 Merge "build: always include host java files in platform.zip" into klp-volantis-dev 2013-12-19 06:34:00 +00:00
Colin Cross c451a373a4 build: always include host java files in platform.zip 
Building recovery requires building a host .jar file.  Change
platform.zip to always include the necessary host java prebuilts,
instead of only when building the 'platform-java' target.

Bug: 12186985
Change-Id: Ic823d764cb6b39bbf8c5d90c94b5dc99b55d34dc
 2013-12-18 20:01:38 -08:00
Elliott Hughes 85967c7ef0 am d46e3f1f: am 3d3dd4a1: Merge "Fix aarch64 and x86-64 AndroidConfig.h." 
* commit 'd46e3f1fdfbd5511fc99fb44fbf272e28a823f8b':
  Fix aarch64 and x86-64 AndroidConfig.h.
 2013-12-18 23:38:27 +00:00
Elliott Hughes d46e3f1fdf am 3d3dd4a1: Merge "Fix aarch64 and x86-64 AndroidConfig.h." 
* commit '3d3dd4a186309a62a744d7fea1157158e05bcf6e':
  Fix aarch64 and x86-64 AndroidConfig.h.
 2013-12-18 15:35:58 -08:00
Elliott Hughes 3d3dd4a186 Merge "Fix aarch64 and x86-64 AndroidConfig.h." 2013-12-18 23:31:47 +00:00
Elliott Hughes 98593a66af Fix aarch64 and x86-64 AndroidConfig.h. 
_LARGEFILE_SOURCE should never be defined with bionic.
_FILE_OFFSET_BITS should be 64 on 64-bit architectures.

Change-Id: I7acf6b39a3af7782d5d7ad00f709593d96fa8522
 2013-12-18 15:17:42 -08:00
Ying Wang 0d16928e60 am 6cc89747: am 8e3a71f7: Merge "Simplify the calculation of LOCAL_UNSTRIPPED_PATH" 
* commit '6cc89747ec0c5a553a99acd9be14eb9eaac1c89f':
  Simplify the calculation of LOCAL_UNSTRIPPED_PATH
 2013-12-18 18:59:38 +00:00
Ying Wang 6cc89747ec am 8e3a71f7: Merge "Simplify the calculation of LOCAL_UNSTRIPPED_PATH" 
* commit '8e3a71f75e08b4ad580903f2edc7edea5dc07806':
  Simplify the calculation of LOCAL_UNSTRIPPED_PATH
 2013-12-18 10:55:54 -08:00
Ying Wang f3584968ff Simplify the calculation of LOCAL_UNSTRIPPED_PATH 
Also this fixes the LOCAL_UNSTRIPPED_PATH if the module is installed to
the vendor dir via LOCAL_PROPRIETARY_MODULE.

Bug: 11289169
Change-Id: Ib07e5761411210963076487fe0e148c259e1e082
 2013-12-18 10:41:01 -08:00