Commit Graph

3597 Commits

Author SHA1 Message Date
Jean-Baptiste Queru 6c75cb3752 am 0332f0ac: Truly default to the full config. 2010-10-22 12:12:52 -07:00
Jean-Baptiste Queru 0332f0ac1e Truly default to the full config.
It is much better than generic for emulator-based work.

Change-Id: I8b69b208bc4969d3f95c3467ca6737de8fd9460d
2010-10-22 10:03:49 -07:00
Ben Cheng a1729fc593 Merge "Insert directives to work around a CPU bug." 2010-10-22 09:49:47 -07:00
Ben Cheng efd2489b39 Insert directives to work around a CPU bug.
Bug: 3117632
Change-Id: I2fb58e7093984d18d2d2d21edf687206f4ddab31
2010-10-21 15:15:09 -07:00
Ying Wang 2923c45d39 am 4038bbc4: am 09a00a67: Don\'t build update zip package if there is no kernel, or it\'s generic device.
Merge commit '4038bbc426776d8adc57d7c3c8123357b50b1615'

* commit '4038bbc426776d8adc57d7c3c8123357b50b1615':
  Don't build update zip package if there is no kernel, or it's generic device.
2010-10-21 13:45:14 -07:00
Dianne Hackborn 894bf9c0a4 Merge "We are API 9 compatible." 2010-10-21 10:51:08 -07:00
Jean-Baptiste Queru 2ea6527e7b am 5a98ec04: resolved conflicts for merge of 54ddcc27 to gingerbread-plus-aosp
Merge commit '5a98ec046c555b02d2f306efc117f7dafd32fc7d'

* commit '5a98ec046c555b02d2f306efc117f7dafd32fc7d':
  Explicitly declare assembly only __ASSEMBLY__ macro for assembly source
2010-10-21 09:53:57 -07:00
Dianne Hackborn 311c267e15 We are API 9 compatible.
Change-Id: Ice1c07993fb66c12cafeaefa874a7adbb19caf21
2010-10-20 18:54:17 -07:00
Ying Wang 4038bbc426 am 09a00a67: Don\'t build update zip package if there is no kernel, or it\'s generic device.
Merge commit '09a00a672bb18dccc97af6090739ea275c39d8a3' into gingerbread-plus-aosp

* commit '09a00a672bb18dccc97af6090739ea275c39d8a3':
  Don't build update zip package if there is no kernel, or it's generic device.
2010-10-20 14:28:52 -07:00
Ying Wang 09a00a672b Don't build update zip package if there is no kernel, or it's generic device.
Move the update package code block forward to be side by side with the ota package code,
so that they are built under the same condition.
Bug: 3116070

Change-Id: I8055909cc614bfbeee215d1b770a80f728e326ee
2010-10-20 14:12:21 -07:00
Jean-Baptiste Queru 5a98ec046c resolved conflicts for merge of 54ddcc27 to gingerbread-plus-aosp
Change-Id: I336f9e6859dce3bb18224b3340837474319c809c
2010-10-19 15:19:45 -07:00
Jean-Baptiste Queru 54ddcc2724 Merge "Explicitly declare assembly only __ASSEMBLY__ macro for assembly source" 2010-10-19 14:43:38 -07:00
Jean-Baptiste Queru 02800879e7 am b9e0af8e: Ignore 8cd38383 from gingerbread
Merge commit 'b9e0af8e059121eac4b7cedba2c0679088bc2466'

* commit 'b9e0af8e059121eac4b7cedba2c0679088bc2466':
  Gingerbread becomes real.
2010-10-19 09:56:28 -07:00
Jean-Baptiste Queru b9e0af8e05 Ignore 8cd38383 from gingerbread
Change-Id: I6414756b09317f0131ac443bf4b1acad82a2574b
2010-10-18 15:40:15 -07:00
Dianne Hackborn 8cd3838371 Gingerbread becomes real.
Change-Id: I20668ef8a9221b802d785e9c8ea1b6b882f828ac
2010-10-18 11:46:50 -07:00
Scott Main 4defb05389 am 67206677: (-s ours) am c0aa1e1b: Merge "remove whitespace from end of package descriptions, which added new lines when the summary includes a paragraph. Do not merge." into gingerbread
Merge commit '672066778bdf3aacdd859b88484cddbd6c8b7909'

* commit '672066778bdf3aacdd859b88484cddbd6c8b7909':
  remove whitespace from end of package descriptions, which added new lines when the summary includes a paragraph. Do not merge.
2010-10-17 11:17:33 -07:00
Nick Pelly ecabc59361 am b4977f59: am e07a9d4a: Always install libnfc_ndef.
Merge commit 'b4977f5980fb4045fc12fbb630823ee8deb814d7'

* commit 'b4977f5980fb4045fc12fbb630823ee8deb814d7':
  Always install libnfc_ndef.
2010-10-17 11:17:24 -07:00
Scott Main 672066778b am c0aa1e1b: Merge "remove whitespace from end of package descriptions, which added new lines when the summary includes a paragraph. Do not merge." into gingerbread
Merge commit 'c0aa1e1b305d85baef1dcedabbea1d084f3ed54a' into gingerbread-plus-aosp

* commit 'c0aa1e1b305d85baef1dcedabbea1d084f3ed54a':
  remove whitespace from end of package descriptions, which added new lines when the summary includes a paragraph. Do not merge.
2010-10-15 18:22:09 -07:00
Nick Pelly b4977f5980 am e07a9d4a: Always install libnfc_ndef.
Merge commit 'e07a9d4aa4afd27461877fbfd4b132a5c6c34954' into gingerbread-plus-aosp

* commit 'e07a9d4aa4afd27461877fbfd4b132a5c6c34954':
  Always install libnfc_ndef.
2010-10-15 18:21:29 -07:00
Xavier Ducrohet 67c0c08b9a am bf4643e2: am 1aff79ad: Add SystemUI (notification bar) to SDK build.
Merge commit 'bf4643e2df9aafabca103f9242b5e7c7da9ded58'

* commit 'bf4643e2df9aafabca103f9242b5e7c7da9ded58':
  Add SystemUI (notification bar) to SDK build.
2010-10-15 13:40:46 -07:00
Scott Main c0aa1e1b30 Merge "remove whitespace from end of package descriptions, which added new lines when the summary includes a paragraph. Do not merge." into gingerbread 2010-10-15 11:20:26 -07:00
Scott Main 5466af5017 remove whitespace from end of package descriptions, which added new lines when the summary includes a paragraph. Do not merge.
Change-Id: Ic8a7bec4f9a0aa81b8ab18d340281ad0d7e7c053
2010-10-15 11:18:58 -07:00
Ying Wang 9af2da0d94 Merge "Verify PRODUCT_* are not modified by Android.mks, but allow them to be read only." 2010-10-15 10:05:02 -07:00
Nick Pelly e07a9d4aa4 Always install libnfc_ndef.
libnfc_ndef is the (very small) library to implement NDEF message parsing.

Change-Id: Iab39a0904e1be2eb1fb07ef9f5cef5095c8a5b7b

Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-15 02:16:40 -07:00
Jim Huang 20d1ba602b Explicitly declare assembly only __ASSEMBLY__ macro for assembly source
To isolate the assembly-only macros in header files, such as
<machine/cpu-features.h>, this patch attempts to declare assembly
only __ASSEMBLY__ macro in build system.

Change-Id: I081c3e46258a9256b20995e4d0b473c64745444c
2010-10-14 16:17:31 +08:00
Xavier Ducrohet bf4643e2df am 1aff79ad: Add SystemUI (notification bar) to SDK build.
Merge commit '1aff79ad44bc4fd6aa5ec2d0922afe5a6bcf455d' into gingerbread-plus-aosp

* commit '1aff79ad44bc4fd6aa5ec2d0922afe5a6bcf455d':
  Add SystemUI (notification bar) to SDK build.
2010-10-13 22:53:45 -07:00
Xavier Ducrohet 1aff79ad44 Add SystemUI (notification bar) to SDK build.
Change-Id: I3f7001bfcf4ce61a523f7b24f61117225362b5a0
2010-10-13 17:26:29 -07:00
Doug Zongker 98582b28e8 radio files aren't modules, prebuilt or otherwise
Change-Id: Ic21cf9f7d9657819e40c6700c98e61971dab24b4
2010-10-13 13:39:56 -07:00
Bill Napier 3dfe7f1d89 am 00b31bee: am fcab8402: Merge "Add in MonkeyRunner target (and dependent libs) to SDK build."
Merge commit '00b31bee97eb739b03eedddf1cd07a86b50259d8'

* commit '00b31bee97eb739b03eedddf1cd07a86b50259d8':
  Add in MonkeyRunner target (and dependent libs) to SDK build.
2010-10-12 16:27:42 -07:00
Joe Onorato 439d9a09f9 resolved conflicts for merge of a0eb715a to master
Change-Id: I6341ca672906de3c21800730ac28ba90ecab51ca
2010-10-11 17:12:46 -07:00
Ying Wang 4a5bd245ff Fix typo.
Change-Id: Iabdc6ec1ead4f37294f01ebebc1e71e188455533
2010-10-11 16:36:02 -07:00
Ying Wang 7522f04a4b Verify PRODUCT_* are not modified by Android.mks, but allow them to be read only.
Bug: 3076955
Change-Id: I7ddcc5b9d6325d3a3c63f952f97034ddf223630a
2010-10-11 16:33:37 -07:00
Bill Napier 00b31bee97 am fcab8402: Merge "Add in MonkeyRunner target (and dependent libs) to SDK build."
Merge commit 'fcab84025edd6ff0a7b1f380b75b99297e0b7c31' into gingerbread-plus-aosp

* commit 'fcab84025edd6ff0a7b1f380b75b99297e0b7c31':
  Add in MonkeyRunner target (and dependent libs) to SDK build.
2010-10-11 15:30:09 -07:00
Bill Napier fcab84025e Merge "Add in MonkeyRunner target (and dependent libs) to SDK build." 2010-10-11 15:18:04 -07:00
Ying Wang 16697b7000 Hook up the dependency.
Now llvm-rs-link is directly called by the build system.

Change-Id: I281cc6fd9e21ee7d120ddea390f802b57c894fd6
2010-10-11 13:44:50 -07:00
Shih-wei Liao f7b32bfe41 Enable LLVM_RS_LINK. No longer forking an LLVM linker inside llvm-rs-cc.
Change-Id: I2ebc6ec759daf36d1e77fa8e30147ab8e40b44fc
2010-10-11 10:36:42 -07:00
Bill Napier 8921ea6982 am 04345cb1: Add in MonkeyRunner target (and dependent libs) to SDK build.
Merge commit '04345cb1147f220c67410c16b362223b1e8952f7'

* commit '04345cb1147f220c67410c16b362223b1e8952f7':
  Add in MonkeyRunner target (and dependent libs) to SDK build.
2010-10-11 10:21:10 -07:00
Xavier Ducrohet a0eb715ab0 am 747bc08a: Merge "Add all languages to the SDK image." into gingerbread
Merge commit '747bc08a8e78c47395bcc72811bb3e81fb7e557b' into gingerbread-plus-aosp

* commit '747bc08a8e78c47395bcc72811bb3e81fb7e557b':
  Add all languages to the SDK image.
2010-10-10 14:37:00 -07:00
Xavier Ducrohet 747bc08a8e Merge "Add all languages to the SDK image." into gingerbread 2010-10-10 14:31:10 -07:00
Xavier Ducrohet 8d3559ee91 Add all languages to the SDK image.
Change-Id: I5d715fdc7f802a55786fff73863bbbc108c780d4
2010-10-10 14:14:49 -07:00
Brian Muramatsu 0dd458e65a am 99185c2a: am cd7170d7: resolved conflicts for merge of 0f8fcbe2 to gingerbread
Merge commit '99185c2a462d563855e4bc0c1e5649a21b2e186b'

* commit '99185c2a462d563855e4bc0c1e5649a21b2e186b':
  Support Additional CTS Host Jars
2010-10-10 12:51:28 -07:00
Bill Napier 0e9473acfb Add in MonkeyRunner target (and dependent libs) to SDK build.
Change-Id: I396635324cf9d2e590513228f5de5cea9df4dfd3
2010-10-10 12:06:57 -07:00
Jean-Baptiste Queru eef1d7d422 manual merge of 547b902e
Change-Id: Ibfc409f53a82bc7cb5caa6aaf94e18589e06009b
2010-10-10 12:00:11 -07:00
Jean-Baptiste Queru 02a7a7a3ec manual merge of 424de177
Change-Id: Iaff23131e9c0ba4de2fc15600f940aa0d23c59fd
2010-10-10 11:58:25 -07:00
Shih-wei Liao c8241ca100 Merge "Make naming consistent: llvm-rs-cc and llvm-rs-link." 2010-10-10 09:58:22 -07:00
Ying Wang 0ce72c458c am 3b008f36: am 83f69eb5: Prepend ccache to CC/CXX if necessary.
Merge commit '3b008f36956c35f58d510ad3da5090cf21a08349'

* commit '3b008f36956c35f58d510ad3da5090cf21a08349':
  Prepend ccache to CC/CXX if necessary.
2010-10-10 09:10:22 -07:00
Dima Zavin d25cc67e4a am 21773134: am 4477db78: CHERRY-PICK: propogate module tags for prebuilts
Merge commit '21773134b44f8d7c7177a60ca94181f2f51ac9c8'

* commit '21773134b44f8d7c7177a60ca94181f2f51ac9c8':
  CHERRY-PICK: propogate module tags for prebuilts
2010-10-10 09:10:19 -07:00
Shih-wei Liao d01fadb6bc Make naming consistent: llvm-rs-cc and llvm-rs-link.
Change-Id: I8e8ae27548131b47fbbd037d55b472d095d7bb8f
2010-10-08 17:55:26 -07:00
Bill Napier 04345cb114 Add in MonkeyRunner target (and dependent libs) to SDK build.
Change-Id: I6aa0b1e48dfd0017b3c68fb3b25c02b703ecbd53
2010-10-08 17:37:29 -07:00
Joe Onorato e814ad4950 am 5c41c178: am 700b88e1: Pass device characteristic information through to aapt.
Merge commit '5c41c17868865d1f2e9e2ff4680b528da61d16af'

* commit '5c41c17868865d1f2e9e2ff4680b528da61d16af':
  Pass device characteristic information through to aapt.
2010-10-08 14:36:43 -07:00