openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity
16,506 Commits 2 Branches 1 Tag 73 MiB
Commit Graph

16506 Commits

Author SHA1 Message Date
Ying Wang 59ff600927 Merge "Unset _JAVA_OPTIONS before running "java -version"." 2014-04-03 01:47:18 +00:00
Greg Hackmann b3f2dac1e0 am 0fd37501: am f518e838: am f1750876: Merge "Revert "HACK: disable emulator on x86_64"" 
* commit '0fd37501c4610783c53a6f8d4000ba7a230f61df':
  Revert "HACK: disable emulator on x86_64"
 2014-04-03 01:41:16 +00:00
Geremy Condra 7afae2c115 Add verity dev keys to build. 
These will be used when making images from your dev machine.

Change-Id: Ib1c894f6874a8e1a7d3d6e8133c8e897d40080d4
 2014-04-02 18:17:39 -07:00
Ying Wang 8a52b231d2 Unset _JAVA_OPTIONS before running "java -version". 
Unfortunately the previous approach of grepping out java version before
"head -n 1" clash with the effort of running "java -version" only once.

Change-Id: Ic78719c3bf1a54a45342d74bbbfa8e83bbc1bce1
 2014-04-02 18:15:10 -07:00
Dirk Dougherty 5fe1b387aa am 812d3d47: am 08032409: Add basic support for rendering dynamic content on pages. 
* commit '812d3d478be650f5b5bb1dfe00d6131986c26886':
  Add basic support for rendering dynamic content on pages.
 2014-04-02 23:35:43 +00:00
Dirk Dougherty 812d3d478b am 08032409: Add basic support for rendering dynamic content on pages. 
* commit '08032409b4dd29740e1c8e703eada0d1ce86e58c':
  Add basic support for rendering dynamic content on pages.
 2014-04-02 23:32:20 +00:00
Greg Hackmann 0fd37501c4 am f518e838: am f1750876: Merge "Revert "HACK: disable emulator on x86_64"" 
* commit 'f518e8380cc5d4e1a25ca5fad161a7cd7e7e78dd':
  Revert "HACK: disable emulator on x86_64"
 2014-04-02 23:04:57 +00:00
Greg Hackmann f518e8380c am f1750876: Merge "Revert "HACK: disable emulator on x86_64"" 
* commit 'f17508760898e0debeb4ae7ff6455d664577c647':
  Revert "HACK: disable emulator on x86_64"
 2014-04-02 22:58:07 +00:00
Greg Hackmann f175087608 Merge "Revert "HACK: disable emulator on x86_64"" 2014-04-02 22:53:45 +00:00
Dirk Dougherty 08032409b4 Add basic support for rendering dynamic content on pages. 
Change-Id: If3ba4f71771a01043ec6d544e3b4a9222ba35daf
 2014-04-02 12:48:41 -07:00
Colin Cross 9871d2e270 am 0396b102: am 578f7ec4: am 45db0e05: Merge "aosp_arm64: increase userdata image size" 
* commit '0396b10235ece43be797e48673ec05c4cf4c74d7':
  aosp_arm64: increase userdata image size
 2014-04-02 17:44:54 +00:00
Colin Cross 0396b10235 am 578f7ec4: am 45db0e05: Merge "aosp_arm64: increase userdata image size" 
* commit '578f7ec487c2c00581cdc9807d0d24883ba4406a':
  aosp_arm64: increase userdata image size
 2014-04-02 17:39:56 +00:00
Colin Cross 578f7ec487 am 45db0e05: Merge "aosp_arm64: increase userdata image size" 
* commit '45db0e058a8b0177b442b195a6ca5590525fb701':
  aosp_arm64: increase userdata image size
 2014-04-02 17:34:30 +00:00
Torne (Richard Coles) dc74b38040 am e4915bbe: am 59d0c658: am c783b9bd: Merge "Add GYP as a target type that requires 2nd arch." 
* commit 'e4915bbebbaaeb337df5dec87b82c18d186a6bfb':
  Add GYP as a target type that requires 2nd arch.
 2014-04-02 17:31:04 +00:00
Colin Cross 45db0e058a Merge "aosp_arm64: increase userdata image size" 2014-04-02 17:28:22 +00:00
Torne (Richard Coles) e4915bbebb am 59d0c658: am c783b9bd: Merge "Add GYP as a target type that requires 2nd arch." 
* commit '59d0c658847d3c8118de46d2d7fa1fa3bfc563d2':
  Add GYP as a target type that requires 2nd arch.
 2014-04-02 17:27:53 +00:00
Torne (Richard Coles) 59d0c65884 am c783b9bd: Merge "Add GYP as a target type that requires 2nd arch." 
* commit 'c783b9bda96a6fc97076bb877645255fb01596fb':
  Add GYP as a target type that requires 2nd arch.
 2014-04-02 17:24:42 +00:00
Torne (Richard Coles) c783b9bda9 Merge "Add GYP as a target type that requires 2nd arch." 2014-04-02 17:20:11 +00:00
Colin Cross d46c7381c8 aosp_arm64: increase userdata image size 
Increase userdata image size to allow make tests to builds with
extra tests to fit.

Change-Id: I2fea99d5a39816e78595215481b60ee51eb9182f
 2014-04-02 09:17:29 -07:00
Narayan Kamath 775da50dfc am bfc9b30d: (-s ours) am 81fc969b: am cf352c5d: Merge "Add warning message for java6 builds." 
* commit 'bfc9b30d36cfbd5c01a0ff0aa7333f81e2033003':
  Add warning message for java6 builds.
 2014-04-02 12:34:28 +00:00
Narayan Kamath bfc9b30d36 am 81fc969b: am cf352c5d: Merge "Add warning message for java6 builds." 
* commit '81fc969b65fb4cc7dc9f5698aa8c37c657f853ef':
  Add warning message for java6 builds.
 2014-04-02 12:26:38 +00:00
Narayan Kamath 81fc969b65 am cf352c5d: Merge "Add warning message for java6 builds." 
* commit 'cf352c5d7e1482cc80be4eb2bbe99041a2345f8e':
  Add warning message for java6 builds.
 2014-04-02 12:23:28 +00:00
Narayan Kamath cf352c5d7e Merge "Add warning message for java6 builds." 2014-04-02 12:19:49 +00:00
Narayan Kamath bee0ec4196 Add warning message for java6 builds. 
The instruction URL has been amended and a few additional
details have been added.

(cherry picked from 8c06afdea3)

Change-Id: Icaffc3b13ed881ac7e29f2021ed31eb1f877a5ab
 2014-04-02 13:16:15 +01:00
Narayan Kamath 797741adca am 839d2829: (-s ours) am 35200762: am e28df19e: Merge "Call "java[c] -version" only once" 
* commit '839d2829bcf2ddc7aaf04f6305b4b6858962896d':
  Call "java[c] -version" only once
 2014-04-02 11:11:58 +00:00
Narayan Kamath 1d671c236a am 823f0ba6: (-s ours) am 0239220a: am 2f5de9f5: Merge "Bring main.mk in sync with master." 
* commit '823f0ba6b8b52566d453d4770ac4e09f89b90842':
  Bring main.mk in sync with master.
 2014-04-02 11:05:22 +00:00
Narayan Kamath 839d2829bc am 35200762: am e28df19e: Merge "Call "java[c] -version" only once" 
* commit '35200762980aa2c0f90e73e38af94fd29b50f91f':
  Call "java[c] -version" only once
 2014-04-02 10:57:13 +00:00
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