Commit Graph

417 Commits

Author SHA1 Message Date
Dirk Dougherty 29eafdea34 AI 149251: Add 1.x Icon Guidelines doc and template pack.
BUG=1790234

Automated import of CL 149251
2009-05-26 08:40:40 -07:00
The Android Open Source Project 9a27222882 merged 866a6d399e with conflicts in core/binary.mk 2009-05-25 08:48:37 -07:00
Android (Google) Code Review 866a6d399e Merge change 1642 into donut
* changes:
  Allow the build system to build Objective-C sources.
2009-05-25 02:53:19 -07:00
Android (Google) Code Review 4afb4f20fc am 3026e96d: Merge change 2245 into donut
Merge commit '3026e96dcea7893d762d3ad1532c3775dfe01b60'

* commit '3026e96dcea7893d762d3ad1532c3775dfe01b60':
  Define TARGET_CPU_ABI for finding native code in .apks
2009-05-22 16:55:41 -07:00
Android (Google) Code Review 3026e96dce Merge change 2245 into donut
* changes:
  Define TARGET_CPU_ABI for finding native code in .apks
2009-05-22 16:53:05 -07:00
Android (Google) Code Review e7a6072d2e am 6941562e: Merge change 2288 into donut
Merge commit '6941562ed3b2ca8fe315ce95bf15a0e57efb4a81'

* commit '6941562ed3b2ca8fe315ce95bf15a0e57efb4a81':
  Adding in the path the new android.tts package.
2009-05-22 16:01:23 -07:00
Android (Google) Code Review 6941562ed3 Merge change 2288 into donut
* changes:
  Adding in the path the new android.tts package.
2009-05-22 15:59:15 -07:00
Doug Zongker c6a5d81c38 am 8ce7c25e: improve password entry for signing keys
Merge commit '8ce7c25e905bc14382359e1cd45d41832bcc7ffa'

* commit '8ce7c25e905bc14382359e1cd45d41832bcc7ffa':
  improve password entry for signing keys
  Modified the image and index URLs to point to guide/index.html now
2009-05-22 15:35:02 -07:00
Doug Zongker 8ce7c25e90 improve password entry for signing keys
Allow the user to set ANDROID_PW_FILE to the name of a file for
storing password keys.  When the tools need additional passwords, they
will rewrite this file and invoke the user's editor for the new
passwords to be added.  This allows passwords to be reused across
invocations of the signing tools, without making the user reenter them
every time.

Paranoid users can use a file stored in a ramdisk, or not use this
feature at all (the code will prompt for passwords in the ordinary way
when ANDROID_PW_FILE is not set).
2009-05-22 15:31:08 -07:00
Dianne Hackborn ecc70d705a Define TARGET_CPU_ABI for finding native code in .apks 2009-05-22 14:54:07 -07:00
Android (Google) Code Review 9b89329237 Merge change 2340
* changes:
  Add libacc to the prelink map.
2009-05-22 12:41:18 -07:00
Jack Palevich 3110264149 Add libacc to the prelink map.
Libacc is a tiny subset of C intended for use as a scripting language for
a 3D UI.
2009-05-22 12:13:32 -07:00
Gaurav Mathur 89d037eb8c Modified the image and index URLs to point to guide/index.html now 2009-05-22 10:23:58 -07:00
Robert Greenwalt fbd10d940d Add PRODUCT_DEFAULT_WIFI_CHANNELS build var.
Allows the build to specify the default number of allowed
WIFI channels.  Part of the fix for 1625953.
2009-05-21 18:46:57 -07:00
Jean-Michel Trivi e1da30426f Adding in the path the new android.tts package. 2009-05-21 18:44:30 -07:00
Gaurav Mathur f326d14362 Modified the image and index URLs to point to guide/index.html now 2009-05-21 13:35:47 -07:00
Android (Google) Code Review 59b3ce6142 am 1028c4f0: Merge change 2184 into donut
Merge commit '1028c4f04051f95fbb4fd9120e7ab1cf43462bd5'

* commit '1028c4f04051f95fbb4fd9120e7ab1cf43462bd5':
  cleanspec.mk: Clean anroid.location intermediates to deal with ILocationCollector removal.
2009-05-21 09:42:43 -07:00
Mike Lockwood 3659b92a55 am 051672bc: Update the error message that occurs when current.xml needs regenerating.
Merge commit '051672bc6c41a5a24ed4057f9d78f5e9caaf7aef'

* commit '051672bc6c41a5a24ed4057f9d78f5e9caaf7aef':
  Update the error message that occurs when current.xml needs regenerating.
2009-05-21 09:42:35 -07:00
Android (Google) Code Review 1028c4f040 Merge change 2184 into donut
* changes:
  cleanspec.mk: Clean anroid.location intermediates to deal with ILocationCollector removal.
2009-05-21 08:52:44 -07:00
Mike Lockwood 21917335cf cleanspec.mk: Clean anroid.location intermediates to deal with ILocationCollector removal.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-05-21 11:35:36 -04:00
Mike Lockwood 051672bc6c Update the error message that occurs when current.xml needs regenerating.
We are no longer using p4 for source control and there are no longer OWNERS files.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-05-21 09:27:39 -04:00
Doug Zongker b4204699a4 am eb338efd: make sure package keys are consistent with shared users
Merge commit 'eb338efd2eae20962c7ca75baf161be540b3d664'

* commit 'eb338efd2eae20962c7ca75baf161be540b3d664':
  make sure package keys are consistent with shared users
2009-05-20 22:44:04 -07:00
Doug Zongker eb338efd2e make sure package keys are consistent with shared users
All APKs that want to share a given user id must be signed with the
same key.  Look inside each APK for what (if any) shared user id it
requests, and error out if any with the same shared user are being
signed with different keys.
2009-05-20 16:50:49 -07:00
Android (Google) Code Review 5d72f8501d Merge change 2060
* changes:
  add an entry for libbinder in the prelink map
2009-05-20 12:40:21 -07:00
Android (Google) Code Review 6e900ab159 am 87fc0fdc: Merge change 1738 into donut
Merge commit '87fc0fdc53b5998a36e0a305518525c28db7f35f'

* commit '87fc0fdc53b5998a36e0a305518525c28db7f35f':
  add -e option to add extra commands to OTA script
2009-05-20 11:49:42 -07:00
Android (Google) Code Review 87fc0fdc53 Merge change 1738 into donut
* changes:
  add -e option to add extra commands to OTA script
2009-05-20 10:01:00 -07:00
David 'Digit' Turner 5dbb529de9 Allow the build system to build Objective-C sources.
This is needed to move our modified SDL sources under external/qemu/distrib.
As per joeo's request, this change also enables target Objective-C compilation, letting it error at build time.
2009-05-20 11:29:15 +02:00
Mathias Agopian 33e8306d2e add an entry for libbinder in the prelink map 2009-05-19 19:56:02 -07:00
Patrick Scott d033d57f40 Change PRIVATE to LOCAL for additional dependencies.
This change will be used by webcore_test in a separate change.
2009-05-19 18:13:58 -04:00
Android (Google) Code Review bcbdb9dbf3 am 2223e3c2: Merge change 1797 into donut
Merge commit '2223e3c2706a0c77b12a4526c78ce1611a641605'

* commit '2223e3c2706a0c77b12a4526c78ce1611a641605':
  Remove tcpdump from the old location (it's now in system/xbin)
2009-05-18 23:55:41 -07:00
Android (Google) Code Review 2223e3c270 Merge change 1797 into donut
* changes:
  Remove tcpdump from the old location (it's now in system/xbin)
2009-05-18 17:31:07 -07:00
The Android Open Source Project 678ea42307 merge 9bd5404a9d w/conflict 2009-05-18 13:47:57 -07:00
Dianne Hackborn 9bd5404a9d Use new aapt feature to add default version info to .apks. 2009-05-18 12:41:45 -07:00
Ed Heyl 50ca1cf796 cherry-pick bd215ed974 2009-05-15 15:02:03 -07:00
Dan Egnor 44aadc7733 Remove tcpdump from the old location (it's now in system/xbin) 2009-05-15 13:05:52 -07:00
Joe Onorato a3072e5ae5 am eefd0212: Print the platform version and version codename in the big build header.
Merge commit 'eefd0212f10ec83b21d1792130b4cad02d2ce4d5'

* commit 'eefd0212f10ec83b21d1792130b4cad02d2ce4d5':
  Print the platform version and version codename in the big build header.
2009-05-15 08:11:38 -07:00
Joe Onorato eefd0212f1 Print the platform version and version codename in the big build header. 2009-05-15 09:10:51 -04:00
Doug Zongker 1c390a2aa9 add -e option to add extra commands to OTA script 2009-05-14 19:06:36 -07:00
Gaurav Mathur fe93ea7068 am cb08f15b: am ee6df9b4: AI 148870: Pinging Ryan for Dr No approval. --- Cloned from CL 147240 by \'g4 patch\'. Original change by dwarren@dwarren-pdk on 2009/04/21 14:59:50. "Making PDK work in SDK environment." This CL should be pretty straight forward and should be touching only PDK related templates, etc. Turns out we no longer need to touch the highlightNav code.
Merge commit 'cb08f15bf48f070c0bc2925846cd7ef7b1dc4c55'

* commit 'cb08f15bf48f070c0bc2925846cd7ef7b1dc4c55':
  AI 148870: Pinging Ryan for Dr No approval.
2009-05-14 16:30:43 -07:00
Gaurav Mathur cb08f15bf4 am ee6df9b4: AI 148870: Pinging Ryan for Dr No approval. --- Cloned from CL 147240 by \'g4 patch\'. Original change by dwarren@dwarren-pdk on 2009/04/21 14:59:50. "Making PDK work in SDK environment." This CL should be pretty straight forward and should be touching only PDK related templates, etc. Turns out we no longer need to touch the highlightNav code.
Merge commit 'ee6df9b4fe6e1a7431ff77d81fb8c164ee99f31d' into donut

* commit 'ee6df9b4fe6e1a7431ff77d81fb8c164ee99f31d':
  AI 148870: Pinging Ryan for Dr No approval.
2009-05-14 16:18:20 -07:00
Gaurav Mathur ee6df9b4fe AI 148870: Pinging Ryan for Dr No approval.
---
  Cloned from CL 147240 by 'g4 patch'.
  Original change by dwarren@dwarren-pdk on 2009/04/21 14:59:50.
  "Making PDK work in SDK environment."
  This CL should be pretty straight forward and should be touching only PDK
  related templates, etc. Turns out we no longer need to touch the highlightNav
  code.

Automated import of CL 148870
2009-05-14 16:02:22 -07:00
The Android Open Source Project 7cdb97d956 Merge commit 'bd215ed' 2009-05-14 14:52:21 -07:00
Doug Kwan bd215ed974 Rollback to gcc-4.2.1 2009-05-14 02:17:32 -07:00
Scott Main 0cf91e6565 am cdc13d7: am 9b54792: AI 148820: adjust the "nolist" class to add bott
Merge commit 'cdc13d717b016c61592e34dacabf24c09c3bca4c'

* commit 'cdc13d717b016c61592e34dacabf24c09c3bca4c':
  AI 148820: adjust the "nolist" class to add bottom-spacing and refine list item padding;
2009-05-13 17:55:09 -07:00
Scott Main cdc13d717b am 9b54792: AI 148820: adjust the "nolist" class to add bottom-spacing a
Merge commit '9b54792d7044125126a9765d1baf3ff0e59efcb4' into donut

* commit '9b54792d7044125126a9765d1baf3ff0e59efcb4':
  AI 148820: adjust the "nolist" class to add bottom-spacing and refine list item padding;
2009-05-13 17:52:28 -07:00
Scott Main 9b54792d70 AI 148820: adjust the "nolist" class to add bottom-spacing and refine list item padding;
add vertical padding to quickview list items so that items are distinguishable when the text wraps-around the line
  BUG=1790235

Automated import of CL 148820
2009-05-13 17:50:33 -07:00
Android (Google) Code Review a7e0325cd6 am 3de1fe6: Merge change 1529 into donut
Merge commit '3de1fe627073608270f844714f24ed83ed4266db'

* commit '3de1fe627073608270f844714f24ed83ed4266db':
  Fix makefile to be compatible with findbugs v 1.3.8
2009-05-13 14:15:30 -07:00
Android (Google) Code Review 3de1fe6270 Merge change 1529 into donut
* changes:
  Fix makefile to be compatible with findbugs v 1.3.8 	modified:   core/java.mk
2009-05-13 14:06:28 -07:00
Android (Google) Code Review 2aa592d51d Merge change 1564
* changes:
  Update build version to Eclair.
2009-05-13 13:52:48 -07:00
Dianne Hackborn ab1e594c5d Update build version to Eclair. 2009-05-13 13:21:02 -07:00