Commit Graph

12841 Commits

Author SHA1 Message Date
Dima Zavin bdbd716eff core: combo: arm: use appropriate mcpu flags for cortex-a7
Change-Id: If00577d36257e4d03f63f36b159bb2e015958d6a
Signed-off-by: Dima Zavin <dima@android.com>
2013-03-23 02:08:38 -07:00
Ying Wang c77e220987 am c170360d: am b2c79174: am ca983c08: am 97c280ec: Merge "We have to use := instead of +="
* commit 'c170360d964fe83e0f1b58c6f7369daaf9aebdd8':
  We have to use := instead of +=
2013-03-23 02:53:51 +00:00
Ying Wang c170360d96 am b2c79174: am ca983c08: am 97c280ec: Merge "We have to use := instead of +="
* commit 'b2c7917463dc898b0b361229ed3345c23ac51d83':
  We have to use := instead of +=
2013-03-23 02:51:46 +00:00
Ying Wang b2c7917463 am ca983c08: am 97c280ec: Merge "We have to use := instead of +="
* commit 'ca983c08fbc49b36eb0d71476842a86afbdcb8ed':
  We have to use := instead of +=
2013-03-22 19:50:09 -07:00
Ying Wang ca983c08fb am 97c280ec: Merge "We have to use := instead of +="
* commit '97c280eced879fb79d32bd527412ab34840dba5c':
  We have to use := instead of +=
2013-03-22 19:47:43 -07:00
Ying Wang 97c280eced Merge "We have to use := instead of +=" 2013-03-23 01:56:36 +00:00
Ying Wang 4d063410a3 We have to use := instead of +=
If we use +=, the right side may be deferred to evaluate,
if that target-specific variable is not defined yet.
That's a mistke.

Change-Id: I1635ee4791473f407866e010d612948c02cdebf6
2013-03-22 18:52:57 -07:00
Ying Wang df7265532d am e104179b: am 9b93f37c: Delete icu4j from pathmap.mk
* commit 'e104179b4a0fe432f859c2bebf0513c30efe671e':
  Delete icu4j from pathmap.mk
2013-03-22 19:40:04 +00:00
Ying Wang e104179b4a am 9b93f37c: Delete icu4j from pathmap.mk
* commit '9b93f37c893979c4c01877ce7d8e653aa9af95b3':
  Delete icu4j from pathmap.mk
2013-03-22 19:37:56 +00:00
Ying Wang 9b93f37c89 Delete icu4j from pathmap.mk
frameworks/base/icu4j is gone in jb-mr2-dev.

Change-Id: I078c8ac3db85598a9b30f8220f251eb7631151e0
2013-03-22 12:32:50 -07:00
The Android Automerger f2c6ad66bf JWQ80C 2013-03-22 10:08:06 -07:00
Scott Main 177979a5de am 5f3aa938: am 5fe9aaac: am 159de1de: am 1b8b0cfe: am 79088780: am 8d92d9ef: am 01a2545b: docs: update templates to remove global content for devsite builds
* commit '5f3aa9382cfefb0097cebe58614297d715f5b854':
  docs: update templates to remove global content for devsite builds
2013-03-22 01:41:13 +00:00
Scott Main 5f3aa9382c am 5fe9aaac: am 159de1de: am 1b8b0cfe: am 79088780: am 8d92d9ef: am 01a2545b: docs: update templates to remove global content for devsite builds
* commit '5fe9aaacefbe3d53a7be280bf017b2e77e7a66ae':
  docs: update templates to remove global content for devsite builds
2013-03-22 01:38:58 +00:00
Scott Main 5fe9aaacef am 159de1de: am 1b8b0cfe: am 79088780: am 8d92d9ef: am 01a2545b: docs: update templates to remove global content for devsite builds
* commit '159de1de00027ebb9280cf6768d59369416c7a13':
  docs: update templates to remove global content for devsite builds
2013-03-21 18:35:43 -07:00
Scott Main 159de1de00 am 1b8b0cfe: am 79088780: am 8d92d9ef: am 01a2545b: docs: update templates to remove global content for devsite builds
* commit '1b8b0cfee98c8d2779dc740707b547846734053f':
  docs: update templates to remove global content for devsite builds
2013-03-21 18:33:53 -07:00
Scott Main 1b8b0cfee9 am 79088780: am 8d92d9ef: am 01a2545b: docs: update templates to remove global content for devsite builds
* commit '7908878061144b25b1e0baf36619db7b32d07c98':
  docs: update templates to remove global content for devsite builds
2013-03-21 18:31:59 -07:00
Scott Main 7908878061 am 8d92d9ef: am 01a2545b: docs: update templates to remove global content for devsite builds
* commit '8d92d9ef824f265979e68da927f01aba4bb6b314':
  docs: update templates to remove global content for devsite builds
2013-03-21 18:29:44 -07:00
Scott Main 8d92d9ef82 am 01a2545b: docs: update templates to remove global content for devsite builds
* commit '01a2545bbab916e45eedbd3708f526ed8bd62935':
  docs: update templates to remove global content for devsite builds
2013-03-21 18:27:16 -07:00
Scott Main 01a2545bba docs: update templates to remove global content for devsite builds
Change-Id: I8c8d052248cebe6408d8c18b44baadd03f3bc96c
2013-03-21 18:12:51 -07:00
The Android Automerger 0456082c6b JWQ80B 2013-03-21 16:08:14 -07:00
The Android Automerger 4a131b8d14 JWQ80 2013-03-21 05:57:05 -07:00
The Android Automerger 2d818b9b97 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-03-21 05:55:09 -07:00
Scott Main b27e23a059 am 2d7a1955: am 1afc758e: am 04f27973: am 8c052d39: am 82fb80eb: am ec48ff2b: am ec93c111: Merge "add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency." into jb-mr1.1-docs
* commit '2d7a195598c5cb594adda42852383f350f8bac58':
  add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency.
2013-03-20 22:32:39 +00:00
Scott Main 2d7a195598 am 1afc758e: am 04f27973: am 8c052d39: am 82fb80eb: am ec48ff2b: am ec93c111: Merge "add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency." into jb-mr1.1-docs
* commit '1afc758e57d6f7c873111086e4c74614634a2856':
  add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency.
2013-03-20 22:30:40 +00:00
Scott Main 1afc758e57 am 04f27973: am 8c052d39: am 82fb80eb: am ec48ff2b: am ec93c111: Merge "add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency." into jb-mr1.1-docs
* commit '04f279730970df0ea5cd8ef6e8f7a5bee6233dc6':
  add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency.
2013-03-20 15:27:05 -07:00
Scott Main 04f2797309 am 8c052d39: am 82fb80eb: am ec48ff2b: am ec93c111: Merge "add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency." into jb-mr1.1-docs
* commit '8c052d395db4643303e03efbc35eca0259cee19e':
  add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency.
2013-03-20 15:25:10 -07:00
Scott Main 8c052d395d am 82fb80eb: am ec48ff2b: am ec93c111: Merge "add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency." into jb-mr1.1-docs
* commit '82fb80eb11188592f34056e8c787a74a28be6543':
  add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency.
2013-03-20 15:23:08 -07:00
Scott Main 82fb80eb11 am ec48ff2b: am ec93c111: Merge "add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency." into jb-mr1.1-docs
* commit 'ec48ff2bed11b0cbdc2686eed28a6edc75425fca':
  add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency.
2013-03-20 15:20:42 -07:00
Scott Main ec48ff2bed am ec93c111: Merge "add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency." into jb-mr1.1-docs
* commit 'ec93c11194f55fb2bd9ae23fa502d701bfb09664':
  add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency.
2013-03-20 15:18:08 -07:00
Scott Main ec93c11194 Merge "add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency." into jb-mr1.1-docs 2013-03-20 22:16:27 +00:00
Scott Main a2303454fd add 64-bit variety NDK packages to download table.
Use same naming convention as SDK packages for consistency.

Change-Id: Iee2673d6c9a4b313988e1a73966d2a0fbee27c2c
2013-03-20 15:01:35 -07:00
The Android Automerger 3cf2cf02aa JWQ79B 2013-03-20 14:37:24 -07:00
The Android Automerger b225d8b17e JDQ39E 2013-03-20 12:24:22 -07:00
The Android Open Source Project 6183078afa am 851401fd: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '851401fdfea793003ac6106edf1e1b17edac5e2c':
  JWQ79
  JWQ78B
  JWQ78
  JWQ77B
  JWQ77
  JWQ73C
  JWQ73B
  JWQ73
  JWQ72B
  JWQ72
  JWQ71B
2013-03-20 16:41:58 +00:00
The Android Open Source Project 851401fdfe Reconcile with jb-mr2-release - do not merge
Change-Id: I548290b010c4622ea6c765453284decd219bb77d
2013-03-20 09:32:13 -07:00
The Android Automerger 9b8ce9c7d8 JWQ79 2013-03-20 05:57:16 -07:00
The Android Automerger 74d2c90590 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-03-20 05:55:12 -07:00
The Android Automerger e0fdbf1878 JWQ78B 2013-03-19 16:53:50 -07:00
Scott Main 51b7898dea am b21f6386: am 18fbd22d: am 22b048e1: am 86372f1c: am 7524d02e: am 4264799b: am 24790db1: fix indentation style for nested lists
* commit 'b21f63864bb349d110bcbfb65928cc3a3f00645b':
  fix indentation style for nested lists
2013-03-19 21:52:42 +00:00
Scott Main b21f63864b am 18fbd22d: am 22b048e1: am 86372f1c: am 7524d02e: am 4264799b: am 24790db1: fix indentation style for nested lists
* commit '18fbd22dffb106181a4a3e8cfbfc1726e9199fa3':
  fix indentation style for nested lists
2013-03-19 21:49:53 +00:00
Scott Main 18fbd22dff am 22b048e1: am 86372f1c: am 7524d02e: am 4264799b: am 24790db1: fix indentation style for nested lists
* commit '22b048e1069c5f5dffd5f13ee4ef35f4ba06fa2b':
  fix indentation style for nested lists
2013-03-19 14:48:42 -07:00
Scott Main 22b048e106 am 86372f1c: am 7524d02e: am 4264799b: am 24790db1: fix indentation style for nested lists
* commit '86372f1c0156b096288274ab85128ffbe9f6f8b4':
  fix indentation style for nested lists
2013-03-19 14:48:02 -07:00
Scott Main 86372f1c01 am 7524d02e: am 4264799b: am 24790db1: fix indentation style for nested lists
* commit '7524d02ef25fed9241e507ebda53d73a643134e5':
  fix indentation style for nested lists
2013-03-19 14:46:48 -07:00
Scott Main 7524d02ef2 am 4264799b: am 24790db1: fix indentation style for nested lists
* commit '4264799b51dd24fdc154a1ae1b70bc4e0bf7e4a9':
  fix indentation style for nested lists
2013-03-19 14:44:53 -07:00
Scott Main 4264799b51 am 24790db1: fix indentation style for nested lists
* commit '24790db1cd7b84c6c36350b232538e519790f799':
  fix indentation style for nested lists
2013-03-19 14:43:04 -07:00
Scott Main 24790db1cd fix indentation style for nested lists
Change-Id: Id4e1aa6f4dacf0984cfc891081799be887543453
2013-03-19 14:38:59 -07:00
Andrew Hsieh f44fa0828b am 726bfa57: am 79a6b76e: am e874f3ab: am 55c06f75: Merge "Duplicate libgcc.a in front of *so"
* commit '726bfa57d82e4214bbca5b64b93ee06a9436799c':
  Duplicate libgcc.a in front of *so
2013-03-19 18:21:42 +00:00
Andrew Hsieh 726bfa57d8 am 79a6b76e: am e874f3ab: am 55c06f75: Merge "Duplicate libgcc.a in front of *so"
* commit '79a6b76ec8a2af8898920806431fe5d806e0155e':
  Duplicate libgcc.a in front of *so
2013-03-19 18:19:26 +00:00
Andrew Hsieh 79a6b76ec8 am e874f3ab: am 55c06f75: Merge "Duplicate libgcc.a in front of *so"
* commit 'e874f3ab7c3f70582f877e762c13c1943ed0e398':
  Duplicate libgcc.a in front of *so
2013-03-19 11:17:07 -07:00
Andrew Hsieh e874f3ab7c am 55c06f75: Merge "Duplicate libgcc.a in front of *so"
* commit '55c06f75951c0d31560f90822cd4e5073055855c':
  Duplicate libgcc.a in front of *so
2013-03-19 11:15:49 -07:00