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

16429 Commits

Author SHA1 Message Date
Narayan Kamath 823f0ba6b8 am 0239220a: am 2f5de9f5: Merge "Bring main.mk in sync with master." 
* commit '0239220a67f168fa30703e07750d1f4907dc99bf':
  Bring main.mk in sync with master.
 2014-04-02 10:57:13 +00:00
Narayan Kamath 3520076298 am e28df19e: Merge "Call "java[c] -version" only once" 
* commit 'e28df19e0e553f1590e304c02b19559dbee48098':
  Call "java[c] -version" only once
 2014-04-02 10:51:15 +00:00
Narayan Kamath 0239220a67 am 2f5de9f5: Merge "Bring main.mk in sync with master." 
* commit '2f5de9f50460bbd369abd4218e746553f15f24fb':
  Bring main.mk in sync with master.
 2014-04-02 10:51:14 +00:00
Narayan Kamath e28df19e0e Merge "Call "java[c] -version" only once" 2014-04-02 10:48:34 +00:00
Ying Wang 8d45e51803 Call "java[c] -version" only once 
and print out the full output if error occurs.
Bug: 11672548

(cherry picked from 7b66d366bf)

Change-Id: I8e2f2ffa2f28146405273b04667efe3c8d1c03ad
 2014-04-02 10:45:17 +00:00
Narayan Kamath 2f5de9f504 Merge "Bring main.mk in sync with master." 2014-04-02 10:45:07 +00:00
Torne (Richard Coles) 3972253b0f Add GYP as a target type that requires 2nd arch. 
"GYP" class targets are used by external/chromium_org for gyp's "none"
type. The processing in these targets needs a separate intermediate
directory for the primary/secondary architecture, so add it to the list
in intermediates-dir-for along with libraries/executables.

Change-Id: Id05899c83b45ed0647dfbfa6b0b2e7f61b04348b
 2014-04-02 11:33:17 +01:00
Nicolas Geoffray 108df57861 am 7e28c074: am 4ca6e2e5: am 38c0ac73: Merge "Use debug versions of dex2oat explicitly." 
* commit '7e28c0742794e0866cfdd19a586f9e5c9b6cfbb4':
  Use debug versions of dex2oat explicitly.
 2014-04-02 09:09:40 +00:00
Nicolas Geoffray 7e28c07427 am 4ca6e2e5: am 38c0ac73: Merge "Use debug versions of dex2oat explicitly." 
* commit '4ca6e2e52832d894b6387120e8b1c447121b5135':
  Use debug versions of dex2oat explicitly.
 2014-04-02 09:02:12 +00:00
Nicolas Geoffray 4ca6e2e528 am 38c0ac73: Merge "Use debug versions of dex2oat explicitly." 
* commit '38c0ac7386f1956cf06079960886275c483e0706':
  Use debug versions of dex2oat explicitly.
 2014-04-02 08:50:03 +00:00
Nicolas Geoffray 38c0ac7386 Merge "Use debug versions of dex2oat explicitly." 2014-04-02 08:45:56 +00:00
Dmitriy Ivanov cc73396810 am 7e739e54: am 83695037: am e44e8b0f: Merge "Remove redundant my_target_global_ldflags" 
* commit '7e739e549bcf7db349d9280321149b4e6839b5ab':
  Remove redundant my_target_global_ldflags
 2014-04-02 00:08:31 +00:00
Tim Murray a6e629e8d5 am 7ebce18a: am 0cad8ee2: am 572e9acc: Merge "Always use prebuilt clang, even if we\'re explicitly building clang/LLVM." 
* commit '7ebce18ac0cff11fbc0877d108463a4538a33194':
  Always use prebuilt clang, even if we're explicitly building clang/LLVM.
 2014-04-02 00:03:34 +00:00
Dmitriy Ivanov 7e739e549b am 83695037: am e44e8b0f: Merge "Remove redundant my_target_global_ldflags" 
* commit '836950372ba00a8e65158e84ce9f35edd25c48ec':
  Remove redundant my_target_global_ldflags
 2014-04-01 23:59:48 +00:00
Dmitriy Ivanov 836950372b am e44e8b0f: Merge "Remove redundant my_target_global_ldflags" 
* commit 'e44e8b0fbeaa52a3ff2ac84d6a804a2883103d7e':
  Remove redundant my_target_global_ldflags
 2014-04-01 23:55:45 +00:00
Dmitriy Ivanov e44e8b0fbe Merge "Remove redundant my_target_global_ldflags" 2014-04-01 23:51:11 +00:00
Dmitriy Ivanov 00479a9fe0 Remove redundant my_target_global_ldflags 
* Fix: my_target_global_ldflags is defined in binary.mk
    so they effectivelly override previous definition

Change-Id: I9c7d9bde82c3a6d25a94ae109fa71ecaa33640b0
 2014-04-01 16:36:21 -07:00
Tim Murray 7ebce18ac0 am 0cad8ee2: am 572e9acc: Merge "Always use prebuilt clang, even if we\'re explicitly building clang/LLVM." 
* commit '0cad8ee2226d3af8dab854f26da405b15b3655ce':
  Always use prebuilt clang, even if we're explicitly building clang/LLVM.
 2014-04-01 23:32:25 +00:00
Tim Murray 0cad8ee222 am 572e9acc: Merge "Always use prebuilt clang, even if we\'re explicitly building clang/LLVM." 
* commit '572e9accc05c467d74d3f4fbf2dbc05b8424e302':
  Always use prebuilt clang, even if we're explicitly building clang/LLVM.
 2014-04-01 23:28:58 +00:00
Tim Murray 572e9accc0 Merge "Always use prebuilt clang, even if we're explicitly building clang/LLVM." 2014-04-01 23:24:56 +00:00
Tim Murray 125a3c9fb0 Always use prebuilt clang, even if we're explicitly building clang/LLVM. 
This is needed for self-hosting Clang/LLVM.

bug 13588226

Change-Id: Ic98adc2b174b12ce046b7b65bbc28901a766a485
 2014-04-01 16:08:51 -07:00
Brian Carlstrom 4d864206ea am 4888fe34: resolved conflicts for merge of cece45d2 to klp-modular-dev-plus-aosp 
* commit '4888fe345306cd747b03757a01089683a2e6c922':
  cortex-a7 supports div
 2014-04-01 19:30:43 +00:00
Brian Carlstrom 4888fe3453 resolved conflicts for merge of cece45d2 to klp-modular-dev-plus-aosp 
Change-Id: Ibec9bab6ec9d46787f521fdaa6a033106d667e76
 2014-04-01 11:47:16 -07:00
Brian Carlstrom 3415c72d7c am 31061ccf: am 5e5d26b1: am 47e60739: Merge "cortex-a7 supports div" 
* commit '31061ccfdaf01603dfdf20f15df8021d1c7d0b85':
  cortex-a7 supports div
 2014-04-01 18:33:38 +00:00
Narayan Kamath c54d7f2148 am b6cc8421: am 2c9552b7: am aafbbe7e: Merge "Add a default value for ro.zygote." 
* commit 'b6cc84212875fda1b8d2ccc0a66fc6a2169933d9':
  Add a default value for ro.zygote.
 2014-04-01 18:33:37 +00:00
Brian Carlstrom 31061ccfda am 5e5d26b1: am 47e60739: Merge "cortex-a7 supports div" 
* commit '5e5d26b1efc6cb73e80e09598ab606678524ff21':
  cortex-a7 supports div
 2014-04-01 18:27:32 +00:00
Brian Carlstrom 5e5d26b1ef am 47e60739: Merge "cortex-a7 supports div" 
* commit '47e6073979254ef4fbc60554079b2bf19ac32ab1':
  cortex-a7 supports div
 2014-04-01 18:23:35 +00:00
Brian Carlstrom 47e6073979 Merge "cortex-a7 supports div" 2014-04-01 18:11:23 +00:00
Brian Carlstrom 49c80cd9b6 cortex-a7 supports div 
(cherry picked from commit cece45d226)

Change-Id: I9975171ef2c2cd3a9481fa0896473fec684095f3
 2014-04-01 10:25:59 -07:00
Narayan Kamath b6cc842128 am 2c9552b7: am aafbbe7e: Merge "Add a default value for ro.zygote." 
* commit '2c9552b78486ae1592303932dc70e00ff487d76f':
  Add a default value for ro.zygote.
 2014-04-01 16:33:26 +00:00
Narayan Kamath 2c9552b784 am aafbbe7e: Merge "Add a default value for ro.zygote." 
* commit 'aafbbe7e8a3a8056c483b6b516c4900cbd3b095e':
  Add a default value for ro.zygote.
 2014-04-01 16:26:40 +00:00
Narayan Kamath aafbbe7e8a Merge "Add a default value for ro.zygote." 2014-04-01 16:21:58 +00:00
Narayan Kamath d5fb782682 Bring main.mk in sync with master. 
These lines were removed in aosp in commit e2d27887b
but a bad merge conflict resolution left them in master.

Subsequent changes on master started using these variables
so they're being brought back.

Change-Id: Ic8f3c295130c47eb0d66057880f9d4f70c89af94
 2014-04-01 13:13:13 +01:00
Nicolas Geoffray ed154c3ba6 Use debug versions of dex2oat explicitly. 
Change-Id: Ie7c238908a5739af752a08fec1a04914026a8f96
 2014-04-01 08:43:26 +01:00
Ying Wang 923f21d903 am ff78e652: am 9cfefe13: am 6a9f2b12: Merge "Add intel to the vendor whitelist" 
* commit 'ff78e6523189dd179a95309cb9630dab2d9f098d':
  Add intel to the vendor whitelist
 2014-04-01 03:10:25 +00:00
Ying Wang ff78e65231 am 9cfefe13: am 6a9f2b12: Merge "Add intel to the vendor whitelist" 
* commit '9cfefe13aeb3295605ea47040767261df95d2cda':
  Add intel to the vendor whitelist
 2014-04-01 03:05:06 +00:00
Ying Wang 9cfefe13ae am 6a9f2b12: Merge "Add intel to the vendor whitelist" 
* commit '6a9f2b1250e276267ce146777fbe6084f8fa7a3f':
  Add intel to the vendor whitelist
 2014-04-01 02:58:51 +00:00
Ying Wang 6a9f2b1250 Merge "Add intel to the vendor whitelist" 2014-04-01 02:51:50 +00:00
Daniel Leung 625974cf2a Add intel to the vendor whitelist 
Change-Id: I91d6ff72629523050b4f26c2d731cac90ef49348
Signed-off-by: Daniel Leung <daniel.leung@intel.com>
Reviewed-by: Jovanovic, Radivoje <radivoje.jovanovic@intel.com>
Reviewed-by: Boie, Andrew P <andrew.p.boie@intel.com>
Reviewed-by: Kumar-mayernik, Nisha <nisha.kumar-mayernik@intel.com>
Reviewed-by: Gumbel, Matthew K <matthew.k.gumbel@intel.com>
Tested-by: Gumbel, Matthew K <matthew.k.gumbel@intel.com>
 2014-04-01 10:38:12 +08:00
Ying Wang 710e0265bc resolved conflicts for merge of f966bda4 to master 
Change-Id: Ic2a16e62c6b9683bd235673e548901381dec9322
 2014-03-31 18:17:22 -07:00
Ying Wang f966bda49f am 4714d3d7: am b34af41e: Merge "Fix java version detection when _JAVA_OPTIONS is set." 
* commit '4714d3d7a604391d174049a7a595e80ebab2da18':
  Fix java version detection when _JAVA_OPTIONS is set.
 2014-04-01 00:15:50 +00:00
Ying Wang 4714d3d7a6 am b34af41e: Merge "Fix java version detection when _JAVA_OPTIONS is set." 
* commit 'b34af41e578b1bbc02470d01593c45fe8b04588b':
  Fix java version detection when _JAVA_OPTIONS is set.
 2014-04-01 00:11:00 +00:00
Brian Carlstrom cece45d226 cortex-a7 supports div 
Change-Id: Id06fe4af3a71bbb8beee4d1846f1917d87664033
 2014-03-31 16:58:09 -07:00
Greg Hackmann dc01136bea Revert "HACK: disable emulator on x86_64" 
This reverts commit 4562c5bcb3.
 2014-03-31 16:54:52 -07:00
Ying Wang b34af41e57 Merge "Fix java version detection when _JAVA_OPTIONS is set." 2014-03-31 23:53:52 +00:00
Peter Ammon bb406bf4c0 Fix java version detection when _JAVA_OPTIONS is set. 
_JAVA_OPTIONS is an environment variable that
can be used to affect the behavior of java and javac.
It is currently required to get Android to build on
some configurations, where the default Java heap size
is too small. Unfortunately, if _JAVA_OPTIONS is set,
both java and javac will output its value to the console
as the first line on every invocation, including trivial
ones like java -version. This will confuse main.mk’s
version detection, which only looks at the first line of
output. Tweak the version detection to run grep before
head, so that the _JAVA_OPTIONS line is filtered by the grep.

Change-Id: I69aee52b56d27711b7d3087ec6b3ebab07ffc3af
 2014-03-31 15:36:02 -07:00
Christopher Ferris 707354c0ad am fc1a735e: am 2d0ecc1b: am 0c4870a4: Merge "Specify -mcpu=cortex-a15 for denver CPU variants." 
* commit 'fc1a735ec618791df306ad2a8f2f94a3db10284d':
  Specify -mcpu=cortex-a15 for denver CPU variants.
 2014-03-31 19:50:03 +00:00
Christopher Ferris fc1a735ec6 am 2d0ecc1b: am 0c4870a4: Merge "Specify -mcpu=cortex-a15 for denver CPU variants." 
* commit '2d0ecc1b0071fbdc62f8d1f26bd510cd24ff47c2':
  Specify -mcpu=cortex-a15 for denver CPU variants.
 2014-03-31 19:17:31 +00:00
Christopher Ferris 2d0ecc1b00 am 0c4870a4: Merge "Specify -mcpu=cortex-a15 for denver CPU variants." 
* commit '0c4870a4cdefb9a0062d2fc1dbf4cdce5bd2cd4c':
  Specify -mcpu=cortex-a15 for denver CPU variants.
 2014-03-31 19:11:30 +00:00
Christopher Ferris 0c4870a4cd Merge "Specify -mcpu=cortex-a15 for denver CPU variants." 2014-03-31 19:06:28 +00:00