Commit Graph

1924 Commits

Author SHA1 Message Date
Ying Wang 18c4a0c102 am 67d6305c: am 55370202: Remvoe whisperd from user_tags.mk.
* commit '67d6305c5c814e3a913a4cd69aafdc2f1410b22d':
  Remvoe whisperd from user_tags.mk.
2011-10-17 20:08:18 -07:00
Ying Wang 67d6305c5c am 55370202: Remvoe whisperd from user_tags.mk.
* commit '5537020242a499e54c351ced962fe437ae1fc4d2':
  Remvoe whisperd from user_tags.mk.
2011-10-17 20:06:51 -07:00
Ying Wang 5537020242 Remvoe whisperd from user_tags.mk.
Change-Id: Ib271c568a6e6907d033040dbe6c3574124fbe469

Bug: 5473754
2011-10-17 17:59:44 -07:00
Dianne Hackborn bf70814bc0 am 9baabf8d: am a0f464a8: New PRODUCT_AAPT_PREF_CONFIG.
* commit '9baabf8d7e017e4f34fef2f4766671804063df28':
  New PRODUCT_AAPT_PREF_CONFIG.
2011-10-17 11:40:32 -07:00
Dianne Hackborn 9baabf8d7e am a0f464a8: New PRODUCT_AAPT_PREF_CONFIG.
* commit 'a0f464a8e7f006177db084df7e925bbb8e5ffed3':
  New PRODUCT_AAPT_PREF_CONFIG.
2011-10-17 11:31:38 -07:00
Dianne Hackborn a0f464a8e7 New PRODUCT_AAPT_PREF_CONFIG.
To use the new aapt --preferred-configurations option.  For use with Prime
to be able to strip everything but xhdpi density bitmaps selectively,
not stripping when this would result in no data for the resource.

Change-Id: I4e1012929b8f9b0b1e79c06496647f69661ba1f2
2011-10-14 19:37:57 -07:00
Ying Wang 83021ee05e am 32fa8a31: Support to package prebuilt NDK libstlport_shared.so into apk
* commit '32fa8a313cf7b94396761dd09addb2d80848b336':
  Support to package prebuilt NDK libstlport_shared.so into apk
2011-10-14 09:26:57 -07:00
Ying Wang 32fa8a313c Support to package prebuilt NDK libstlport_shared.so into apk
To package libstlport_shared.so, use the following syntax in the app
module definition:
LOCAL_NDK_STL_VARIANT := stlport_shared
LOCAL_NDK_VERSION := <num>

The rationale behind is:
The NDK prebiult libstlport_shared.so is intentionally different from
the system libstlport.so.
Essentially they are slightly different versions of the library so
shouldn't be mixed up.
libstlport.so is used by the system, but not exposed by the NDK, it is
routinely tweaked in various ways between platform releases, and there
is no guarantee that its ABI is stable, or that it will not be replaced
by something else in the future.
libstlport_shared.so is typically distributed with application packages,
and should not be part of the system.

Change-Id: I72c9911781f7d8402687e9891f3f605f3a60be22
2011-10-13 17:31:45 -07:00
Dima Zavin 803d8d1c17 am 5fc85c6b: am 854233e9: core: remove the built fake packages (not installed) on installclean
* commit '5fc85c6bfe8f9789f12cc44cba123eadf98abce2':
  core: remove the built fake packages (not installed) on installclean
2011-10-12 20:42:55 -07:00
Dima Zavin e5740ba931 am eee20ca4: am 7dac5909: core: remove fake package timestamps on installclean
* commit 'eee20ca405c886773104ed063124b5f5a80c6f77':
  core: remove fake package timestamps on installclean
2011-10-12 18:39:12 -07:00
Dima Zavin 5fc85c6bfe am 854233e9: core: remove the built fake packages (not installed) on installclean
* commit '854233e9b2e24c75f63db96bb1be9a7bb2cecd84':
  core: remove the built fake packages (not installed) on installclean
2011-10-12 13:50:40 -07:00
Dima Zavin 854233e9b2 core: remove the built fake packages (not installed) on installclean
Change-Id: I1ff3754132a48c545d0a3215ae23d204aba50637
Signed-off-by: Dima Zavin <dima@android.com>
2011-10-12 13:34:32 -07:00
Dima Zavin eee20ca405 am 7dac5909: core: remove fake package timestamps on installclean
* commit '7dac5909d23a78ff6ed2af6e4d937354de8c7756':
  core: remove fake package timestamps on installclean
2011-10-11 17:32:50 -07:00
Dima Zavin 7dac5909d2 core: remove fake package timestamps on installclean
Change-Id: Ic07af1f751b301b69fa5cbbb7bf51ad718d54d52
Signed-off-by: Dima Zavin <dima@android.com>
2011-10-11 15:54:10 -07:00
Ying Wang ce1e1de572 am d8945297: Merge "Use shell variable to eliminate in commands."
* commit 'd89452976b6d476896747a0136a1ad40e514e162':
  Use shell variable to eliminate $(eval) in commands.
2011-10-11 10:14:15 -07:00
Ying Wang d89452976b Merge "Use shell variable to eliminate $(eval) in commands." 2011-10-11 10:11:44 -07:00
Android Git Automerger 861348a4be Merge branch 'master' of ssh://android-git:29418/platform/build 2011-10-11 10:10:35 -07:00
Ying Wang 9146f11a23 am e27347e7: Merge "Enforce no nonexistent modules in PRODUCT_PACKAGES for sdk builds"
* commit 'e27347e7a4e41e250b689d54ae911522623b2427':
  Enforce no nonexistent modules in PRODUCT_PACKAGES for sdk builds
2011-10-11 10:04:27 -07:00
Ying Wang 67fc253d99 am 5e550018: Merge "Remove PRODUCT_CONTRIBUTORS_FILE which is no longer in use."
* commit '5e55001859062d8a0b11f26347b39c5f012bd1f6':
  Remove PRODUCT_CONTRIBUTORS_FILE which is no longer in use.
2011-10-11 10:04:27 -07:00
Ying Wang e27347e7a4 Merge "Enforce no nonexistent modules in PRODUCT_PACKAGES for sdk builds" 2011-10-11 10:01:50 -07:00
Ed Heyl 738f053bf3 mr0 - do not merge
Change-Id: I3b19b8cdad6820bc8ab2047ac48cb2964132a3fa
2011-10-11 06:40:06 -07:00
Ying Wang 486be82198 Enforce no nonexistent modules in PRODUCT_PACKAGES for sdk builds
Bug: 5430740
- Remove nonexistent names in PRODUCT_PACKAGES.
- Push down bluetooth-health, hostapd and wpa_supplicant.conf to
generic_no_telephony.mk and large_emu_hw.mk because they are not needed
by sdk builds.
- Remove core.mk from generic_armv5.mk and generic_x86.mk because they
  already inherit from generic.mk.

Change-Id: Ie44b95f1cae7ed0d4cf827ffce6a91d41902434d
2011-10-10 13:10:13 -07:00
Ying Wang 32ef58e2c1 Remove PRODUCT_CONTRIBUTORS_FILE which is no longer in use.
Bug: 5433204
Change-Id: Id88c21f8d1991d8cbcc5bb7dae784aa72dc4becf
2011-10-10 09:54:47 -07:00
Doug Zongker 4e140b0edb am 68fbf0fa: am 49c6a2b5: fix build fingerprint: dev-keys vs test-keys
* commit '68fbf0fa52ee5f749b8ec26dd71ed2f72aad37e0':
  fix build fingerprint: dev-keys vs test-keys
2011-10-05 13:08:41 -07:00
Doug Zongker 68fbf0fa52 am 49c6a2b5: fix build fingerprint: dev-keys vs test-keys
* commit '49c6a2b5e4314bd8acfbca88cd43ea49a2c8c30e':
  fix build fingerprint: dev-keys vs test-keys
2011-10-05 13:06:30 -07:00
Doug Zongker 49c6a2b5e4 fix build fingerprint: dev-keys vs test-keys
The fingerprint should only say dev-keys if it's actually using custom
keys; builds with the old default (from build/target/product/security)
should still say test-keys.

Change-Id: Ib8c662c348cf63f5db47e2f8f81bc3246cb15fdc
2011-10-05 12:41:56 -07:00
Doug Zongker ceae76ac75 am a4bbf24a: am f9ede7e9: Merge "sign non-PRESIGNED prebuilt apks" into ics-factoryrom
* commit 'a4bbf24afde6288f5511fdb1f5600cafa27d9a93':
  sign non-PRESIGNED prebuilt apks
2011-10-05 09:59:40 -07:00
Doug Zongker a4bbf24afd am f9ede7e9: Merge "sign non-PRESIGNED prebuilt apks" into ics-factoryrom
* commit 'f9ede7e925a668cc8c0b44cb69c0795cb6c8c896':
  sign non-PRESIGNED prebuilt apks
2011-10-05 09:58:05 -07:00
Doug Zongker f9ede7e925 Merge "sign non-PRESIGNED prebuilt apks" into ics-factoryrom 2011-10-05 09:55:58 -07:00
Doug Zongker 08d79c12de sign non-PRESIGNED prebuilt apks
Since dev keys can now vary per device, we can't assume they are
checked in with the correct signature.

Change-Id: I7577a3a6bd98d005c15936c99b2944acc4412798
2011-10-05 09:49:24 -07:00
Ying Wang 0611aeedeb Merge "Install path support for vendor modules." into ics-factoryrom 2011-10-05 09:07:53 -07:00
Ed Heyl 086af9ebc7 am 213c1f98: am 81703a19: Merge "Support for product-specific dev keys." into ics-factoryrom
* commit '213c1f985daa159065ee41c4fc6ca4e1b8def189':
  Support for product-specific dev keys.
2011-10-04 16:16:38 -07:00
Ed Heyl 213c1f985d am 81703a19: Merge "Support for product-specific dev keys." into ics-factoryrom
* commit '81703a19001ec219c35cb0ecf9bafb6e0dbc1e1d':
  Support for product-specific dev keys.
2011-10-04 16:15:25 -07:00
Ying Wang 3c21fe5b12 Support for product-specific dev keys.
Change-Id: Id577a72ee9f7cd70e8ca77efcbf10a37885c7d6f
2011-10-04 10:50:08 -07:00
Ying Wang eba48f6fdb am 12f60a5f: Merge "Enforce no prebuilt apks in PRODUCT_COPY_FILES."
* commit '12f60a5f349b81ea720d347a51e6d68756a70200':
  Enforce no prebuilt apks in PRODUCT_COPY_FILES.
2011-10-04 10:16:17 -07:00
Ying Wang 6886410210 Enforce no prebuilt apks in PRODUCT_COPY_FILES.
Bug: 5391935
Change-Id: I106ffc3277914e57cc1a6fb4cd782286d61b8013
2011-09-29 13:23:25 -07:00
Ying Wang b67bd2fd93 am 2a71850e: Merge "Generate an empty target if there is no packages"
* commit '2a71850eb330ae9e9b098246de09998687c4909c':
  Generate an empty target if there is no packages
2011-09-27 11:33:42 -07:00
Ying Wang 2a71850eb3 Merge "Generate an empty target if there is no packages" 2011-09-27 11:31:12 -07:00
Jean-Baptiste Queru 097745ae50 am e1891b79: Merge "resolved conflicts for merge of 2f2882a0 to master"
* commit 'e1891b79455842a794c17c93ce3a4a066076c802':
  sdk: Fix broken google_sdk and google_sdk_x86 add-on build.
2011-09-26 13:25:58 -07:00
Ying Wang f272cd6c22 Generate an empty target if there is no packages
Generate an empty target even if there is no packages defined in the
source tree. Such case can happen when building in an unbundled branch.

Change-Id: Id8b94bc00557cd5ea2066859e440427474ced5f5
2011-09-26 12:05:06 -07:00
David 'Digit' Turner becc3da915 resolved conflicts for merge of 2f2882a0 to master
Change-Id: Ia07eb9d022a8036c2b1674c591514740aa0d4596
2011-09-23 11:44:29 +02:00
David 'Digit' Turner 2f2882a04e am fdb13fcc: am 0cc5e1ef: Merge "sdk: Fix broken google_sdk and google_sdk_x86 add-on build." into gingerbread
* commit 'fdb13fccfecdf526549ad453a20e8136253edb51':
  sdk: Fix broken google_sdk and google_sdk_x86 add-on build.
2011-09-22 23:01:17 -07:00
David 'Digit' Turner fdb13fccfe am 0cc5e1ef: Merge "sdk: Fix broken google_sdk and google_sdk_x86 add-on build." into gingerbread
* commit '0cc5e1ef457f0eda3a3dfadc094b0e796ba9f3f2':
  sdk: Fix broken google_sdk and google_sdk_x86 add-on build.
2011-09-22 22:59:07 -07:00
David 'Digit' Turner 0cc5e1ef45 Merge "sdk: Fix broken google_sdk and google_sdk_x86 add-on build." into gingerbread 2011-09-22 22:58:04 -07:00
Dianne Hackborn 3c5538c40d am 228fd69e: Merge "Let\'s call MR0 4.0.1."
* commit '228fd69eafc8b3d6e59ec6a03d89c9791334b7e5':
  Let's call MR0 4.0.1.
2011-09-21 18:13:32 -07:00
Dianne Hackborn 228fd69eaf Merge "Let's call MR0 4.0.1." 2011-09-21 18:11:44 -07:00
Xavier Ducrohet 4d2b9bf341 Cherrypick 6de7bc61 from master. do not merge.
Copy notice file in the new system image folder

Change-Id: I66496f382b2d13b030de569b573630f3abe5b9de
2011-09-21 16:03:19 -07:00
Xavier Ducrohet 3e075226b2 am aabcd6a5: Merge "Copy notice file in the new system image folder"
* commit 'aabcd6a59507d7a1509ac77d95224d9272a04466':
  Copy notice file in the new system image folder
2011-09-21 15:57:10 -07:00
Dianne Hackborn 7766ea2884 Let's call MR0 4.0.1.
Change-Id: Ie55012702e2cfb1eb247941e8b73519ad9b5c547
2011-09-21 15:25:37 -07:00
Xavier Ducrohet 6de7bc611b Copy notice file in the new system image folder
Change-Id: I4fafe5dc9dc1749de56267206a9b847a97e6a14b
2011-09-21 14:25:52 -07:00