Commit Graph

12063 Commits

Author SHA1 Message Date
Stephen Hines 9ac9b53dc6 Reduce RS build verbosity.
Change-Id: I9d04198ed1b9025abd60080c5ef23b3ce5ef9e22
2013-02-27 00:51:08 -08:00
Ying Wang 48b6e18f1f Merge "Build rs_compatibility_jni_libs into product-specific dir" into jb-mr2-dev 2013-02-26 00:19:04 +00:00
Ying Wang 370fa673b5 Build rs_compatibility_jni_libs into product-specific dir
They can't be shared across products.

Change-Id: I2e2b9126f2e78eb28866978d58cf6eb8c52f3d09
2013-02-25 16:06:42 -08:00
Jean-Baptiste Queru 4dbbd8a37e am 757e212c: am 0426da29: Merge "Fixed error message for using OpenJDK."
* commit '757e212ca2eb5584efb1631c3b26241ffb06e3c6':
  Fixed error message for using OpenJDK.
2013-02-25 21:21:03 +00:00
Jean-Baptiste Queru 757e212ca2 am 0426da29: Merge "Fixed error message for using OpenJDK."
* commit '0426da292cc7cf4b7889e6105c8ef8aa9cee4ce3':
  Fixed error message for using OpenJDK.
2013-02-25 13:18:26 -08:00
Jean-Baptiste Queru 0426da292c Merge "Fixed error message for using OpenJDK." 2013-02-25 21:01:49 +00:00
Tim Roes 304f5194fd Fixed error message for using OpenJDK.
Output a meaningful error message, when OpenJDK is detected
instead of giving the "wrong java version" output.
That output confused several users (from experiences in IRC)
since it gives you an output like "You are using java
version 1.6.0, right version would be Java SE 1.6".

Change-Id: I31ceeb03f1f98524b2b7de9b8be45231985fdb9e
Signed-off-by: Tim Roes <tim.roes88@googlemail.com>
2013-02-23 20:25:00 +01:00
Ken Sumrall 7ef64e31a9 am 89fbf2e2: am 3a588682: am 8d27d6d3: am 44281a1f: Add unified fstab support to release tools
* commit '89fbf2e2acfa5ad94308876abd86a14194fd02c1':
  Add unified fstab support to release tools
2013-02-23 00:58:55 -08:00
Ken Sumrall 89fbf2e2ac am 3a588682: am 8d27d6d3: am 44281a1f: Add unified fstab support to release tools
* commit '3a58868258aea60d17abe7e4169a3a64bf1a0d21':
  Add unified fstab support to release tools
2013-02-23 00:55:23 -08:00
Ken Sumrall 3a58868258 am 8d27d6d3: am 44281a1f: Add unified fstab support to release tools
* commit '8d27d6d378fffba4c4254ccad6a1872692839a8c':
  Add unified fstab support to release tools
2013-02-23 00:53:10 -08:00
Ken Sumrall 8d27d6d378 am 44281a1f: Add unified fstab support to release tools
* commit '44281a1f3ec99d650595b01b34185e1ffb129c6f':
  Add unified fstab support to release tools
2013-02-23 00:49:39 -08:00
Nick Kralevich 4da8048647 am 3346da0a: am 33b190f6: Merge "build: update fs_config calls for capabilities change."
* commit '3346da0a93f60a7039581e48182be347dcceabec':
  build: update fs_config calls for capabilities change.
2013-02-22 18:31:43 -08:00
Nick Kralevich 3346da0a93 am 33b190f6: Merge "build: update fs_config calls for capabilities change."
* commit '33b190f6c6653b3c3493c725a96ff340c4466604':
  build: update fs_config calls for capabilities change.
2013-02-22 18:28:13 -08:00
Ying Wang bff929e05d Merge "Don't run cleanspecs if you are using mm/mmm." 2013-02-23 02:19:49 +00:00
Ying Wang 50e52fa11e Don't run cleanspecs if you are using mm/mmm.
There is lurky bug in the previous logic I believe:
in rare cases, people saw almost all cleansteps rerun.
Anyway, it's very rare that you need to run cleansteps when you run mm/mmm.

Change-Id: I42e84b3bf01590712ba1b167fe9a500f4ae1ddde
2013-02-22 18:15:29 -08:00
Nick Kralevich 33b190f6c6 Merge "build: update fs_config calls for capabilities change." 2013-02-23 02:04:55 +00:00
Christopher Ferris 310e4b2fcc Merge "Adding TARGET_CPU_VARIANT to config file." 2013-02-23 01:33:53 +00:00
Christopher Ferris 6d7c03bfc3 Adding TARGET_CPU_VARIANT to config file.
Adding this since all arm builds will require TARGET_CPU_VARIANT
to be set to a valid value in the near future.

Bug: 8005082
Change-Id: I5b945a36c10e0095bccbe453f7652da08ebc6162
2013-02-22 17:24:25 -08:00
Ken Sumrall 44281a1f3e Add unified fstab support to release tools
Update the release tools to be able to handle the new unified fstab.

Change-Id: Id9d1810c89aba415e83ae2fc586520f148ec73ef
2013-02-22 16:55:30 -08:00
Ying Wang e84420c3e4 Merge "Untwist the target/host shared library dependencies." 2013-02-22 23:27:54 +00:00
Ying Wang 9485a57bb2 Untwist the target/host shared library dependencies.
Before this, if there are duplicate module names in both the host and
target spaces, LOCAL_SHARED_LIBRARIES results in mixed dependencies.

Bug: 7026946
Change-Id: I5407e3d078a8903c94978cc6d3e256851c52340f
2013-02-22 14:32:30 -08:00
The Android Open Source Project bc0efad108 am 33b8ce1b: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '33b8ce1bfd7f8e70e28859951cc4fc48c31d671a':
  Drop official SDK 17
  JOP40G
2013-02-22 13:42:02 -08:00
The Android Open Source Project 33b8ce1bfd Reconcile with jb-mr1-release - do not merge
Change-Id: I652e19ace85b7b2be9c723b5ce1e7f36f7ae963f
2013-02-22 13:39:36 -08:00
Geremy Condra e822c1e3e1 Merge "Revert "Remove ping."" 2013-02-22 19:41:02 +00:00
Geremy Condra 09d232e977 Revert "Remove ping."
This reverts commit 68007028fd

Change-Id: I07ff0d756dff12472633e535c51a29b9062cc3fc
2013-02-22 19:37:38 +00:00
Ying Wang 00b2811e66 resolved conflicts for merge of 40ab92d0 to master
Change-Id: I400c1655c57237687a21a017b9c2065d166e3097
2013-02-22 11:02:03 -08:00
Ying Wang 1d1378462a am 5cfe1c55: am 4703b491: Merge "We shouldn\'t use temporary variable in the build recipe."
* commit '5cfe1c55c70b69105c78c4ebc49e09ab3fa3d652':
  We shouldn't use temporary variable in the build recipe.
2013-02-22 10:52:49 -08:00
Ying Wang 40ab92d002 am b303d5d7: Merge "[MIPS] Update build rules"
* commit 'b303d5d7d461e7f9eca3fc058c6eed69bfed4094':
  [MIPS] Update build rules
2013-02-22 10:50:21 -08:00
Ying Wang 5cfe1c55c7 am 4703b491: Merge "We shouldn\'t use temporary variable in the build recipe."
* commit '4703b491d73938f7861b874a5212b2214a74e988':
  We shouldn't use temporary variable in the build recipe.
2013-02-22 10:50:21 -08:00
Ying Wang b303d5d7d4 Merge "[MIPS] Update build rules" 2013-02-22 18:03:15 +00:00
Ying Wang 4703b491d7 Merge "We shouldn't use temporary variable in the build recipe." 2013-02-22 18:02:04 +00:00
Ying Wang 514cc4d25e We shouldn't use temporary variable in the build recipe.
Use $@ instead.

Change-Id: Ida0960a453b3701383a31f698c3163a297c4bce5
2013-02-22 10:01:33 -08:00
Ying Wang e5d6d900c2 Merge "We shouldn't use temporary variable in the build recipe." 2013-02-22 18:00:56 +00:00
Ying Wang b8a256a1fa We shouldn't use temporary variable in the build recipe.
Use $@ instead.

Change-Id: Ida0960a453b3701383a31f698c3163a297c4bce5
2013-02-22 09:59:17 -08:00
Ken Sumrall 14c63cf678 Merge "Start producing target files using the unified fstab." 2013-02-22 06:23:02 +00:00
Ying Wang b263df680e Merge "Support for ANDROID_BUILD_EVERYTHING_BY_DEFAULT" 2013-02-22 02:43:26 +00:00
Ying Wang 3126831621 Support for ANDROID_BUILD_EVERYTHING_BY_DEFAULT
Set ANDROID_BUILD_EVERYTHING_BY_DEFAULT to true to build everything by
default. You can set it in your .bashrc or buildspec.mk.

Change-Id: I0bc2461d0e17c63a6f1c439cdfaaa94e36483a02
2013-02-21 18:42:28 -08:00
Ken Sumrall 75f1f6f0f4 Merge "Add unified fstab support to release tools" 2013-02-22 01:04:41 +00:00
Ken Sumrall 31ce31f607 Start producing target files using the unified fstab.
Change-Id: I6d9783fba3fcb4617323071bf924f50b66ad6935
2013-02-21 16:27:25 -08:00
Ken Sumrall 3b07cf1277 Add unified fstab support to release tools
Update the release tools to be able to handle the new unified fstab.

Change-Id: Id9d1810c89aba415e83ae2fc586520f148ec73ef
2013-02-21 16:26:46 -08:00
Scott Main e51e369193 am 540bad2a: am 10bbe830: am 121a4a3e: am d6cb8fac: docs: fix padding for left-figure class
* commit '540bad2add395bf0ba67c31609cb91024e66c551':
  docs: fix padding for left-figure class
2013-02-21 15:20:07 -08:00
Scott Main 341ac8b423 am 3c205c4f: am 4edc153f: am 245a4f64: am 0e69c3e4: Merge "docs: add image frame style and left-float figure box" into jb-mr1-dev
* commit '3c205c4fef400c6fce60d9d1f425491a0b5ea3c5':
  docs: add image frame style and left-float figure box
2013-02-21 15:20:06 -08:00
Robert Ly 283d7a0231 am e362f6bb: am c6ff854b: am eb8edf43: am dae7b523: Revert "support differently named lists.js files"
* commit 'e362f6bba4eaf077981a5d4e29cfcad5d5fee56d':
  Revert "support differently named lists.js files"
2013-02-21 15:20:06 -08:00
Geremy Condra 44e8fb4823 Merge "Remove ping." 2013-02-21 22:40:11 +00:00
Scott Main 540bad2add am 10bbe830: am 121a4a3e: am d6cb8fac: docs: fix padding for left-figure class
* commit '10bbe8309767a82ddc2d114856722b0f51bcbf87':
  docs: fix padding for left-figure class
2013-02-21 14:33:06 -08:00
Scott Main 3c205c4fef am 4edc153f: am 245a4f64: am 0e69c3e4: Merge "docs: add image frame style and left-float figure box" into jb-mr1-dev
* commit '4edc153fe6e44495deaf07e720bccc97d8e3fd07':
  docs: add image frame style and left-float figure box
2013-02-21 14:33:06 -08:00
Robert Ly e362f6bba4 am c6ff854b: am eb8edf43: am dae7b523: Revert "support differently named lists.js files"
* commit 'c6ff854bbf0b436dc3467801cd5aa595a5064c5a':
  Revert "support differently named lists.js files"
2013-02-21 14:33:05 -08:00
Scott Main 10bbe83097 am 121a4a3e: am d6cb8fac: docs: fix padding for left-figure class
* commit '121a4a3e29c7f76264ea450ee750e68084669556':
  docs: fix padding for left-figure class
2013-02-21 14:28:56 -08:00
Scott Main 4edc153fe6 am 245a4f64: am 0e69c3e4: Merge "docs: add image frame style and left-float figure box" into jb-mr1-dev
* commit '245a4f644c79f584ac205240069c15d5afd77d8b':
  docs: add image frame style and left-float figure box
2013-02-21 14:28:56 -08:00
Robert Ly c6ff854bbf am eb8edf43: am dae7b523: Revert "support differently named lists.js files"
* commit 'eb8edf43a12c4ef1f9ad6667c33960d9a3a52db0':
  Revert "support differently named lists.js files"
2013-02-21 14:28:55 -08:00