Commit Graph

1897 Commits

Author SHA1 Message Date
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
Ying Wang 43e18e0d7b Install path support for vendor modules.
Bug: 5284764
Set "LOCAL_PROPRIETARY_MODULE := true" to install module to vendor
partition.

Change-Id: I9acdda6b2ff3142628b9849ea534b3ec288545a0
2011-09-21 13:32:36 -07:00
Ying Wang ae0c5dd06c am 99732e2c: am 04c48584: Merge "Fix OVERRIDE_BUILT_MODULE_PATH for prebuilt shared libraries." into ics-factoryrom
* commit '99732e2c5937078ab3a65245db4d034669c36d02':
  Fix OVERRIDE_BUILT_MODULE_PATH for prebuilt shared libraries.
2011-09-20 20:07:14 -07:00
Ying Wang 99732e2c59 am 04c48584: Merge "Fix OVERRIDE_BUILT_MODULE_PATH for prebuilt shared libraries." into ics-factoryrom
* commit '04c485843f9fce0f66d18cb96e1051b7382b1f38':
  Fix OVERRIDE_BUILT_MODULE_PATH for prebuilt shared libraries.
2011-09-20 20:04:50 -07:00
Ying Wang 57a90a14ef am 415f1f66: Merge "Install path support for vendor modules."
* commit '415f1f66133f8b7873345457696e7a3cca2b85c2':
  Install path support for vendor modules.
2011-09-20 20:04:00 -07:00
Ying Wang 415f1f6613 Merge "Install path support for vendor modules." 2011-09-20 20:02:27 -07:00
Ying Wang 04c485843f Merge "Fix OVERRIDE_BUILT_MODULE_PATH for prebuilt shared libraries." into ics-factoryrom 2011-09-20 20:02:17 -07:00
Doug Zongker a2d54cc0ef am c30e1903: am 7094bf3a: am 25863d73: build the sqlite3 binary for use by the OTA tools
* commit 'c30e190347e88fa56afda1024cd117b2ac9b5fa0':
  build the sqlite3 binary for use by the OTA tools
2011-09-20 14:15:16 -07:00
Doug Zongker c30e190347 am 7094bf3a: am 25863d73: build the sqlite3 binary for use by the OTA tools
* commit '7094bf3a5e9d1983d6877f580506d93fd736c437':
  build the sqlite3 binary for use by the OTA tools
2011-09-20 09:31:54 -07:00
Doug Zongker 7094bf3a5e am 25863d73: build the sqlite3 binary for use by the OTA tools
* commit '25863d738ca171015a57a2154ff6ebe4ae8f5483':
  build the sqlite3 binary for use by the OTA tools
2011-09-20 09:27:07 -07:00
Doug Zongker 25863d738c build the sqlite3 binary for use by the OTA tools
Change-Id: I2c6cc02dec74fdcedd3e2a6f3ddb1dfba657a883
2011-09-19 16:50:39 -07:00
Dianne Hackborn 31649ddd74 am 14169bce: New LOCAL_SDK_RES_VERSION config var.
* commit '14169bcea813b2f6c5aa6993b7f154d9c03f5b18':
  New LOCAL_SDK_RES_VERSION config var.
2011-09-19 10:47:39 -07:00
Dianne Hackborn 14169bcea8 New LOCAL_SDK_RES_VERSION config var.
This allows an app to target a different SDK level for its resources
than it uses for its Java code.  This is useful because it is generally
safe to use various newer symbols like attribute names, as older versions
of the platform will simply ignore them.

Change-Id: Ida19ec9f259c4ea70de846e9a63546e263b1c91e
2011-09-19 10:42:04 -07:00
Raphael 514c487dcb Enable building sdk/avdlauncher in the Win SDK. DO NOT MERGE.
Required by Change-Id Ic651e3c3 in sdk.git

Cherry-pick from master c36df7b12b

Change-Id: Ic51ad7df01ce1bc926ba69f8a031a060edbf0bd1
2011-09-16 21:35:42 -07:00
Raphael 77fed26921 Don't strip llvm-rs-rc in core/Makefile. DO NOT MERGE.
This is done in development/build/sdk.atree now.

Cherry-pick from master 469bbdf8c3
2011-09-16 21:25:49 -07:00
Raphael b0206e7dad am cf29731e: Merge "Don\'t strip llvm-rs-rc in core/Makefile"
* commit 'cf29731eea6ecf11a4d5f4d8ae2e549f58f60fc0':
  Don't strip llvm-rs-rc in core/Makefile
2011-09-16 12:27:10 -07:00
Raphael cf29731eea Merge "Don't strip llvm-rs-rc in core/Makefile" 2011-09-16 12:25:07 -07:00
Raphael c5fa9623a1 am aae801fb: Merge "Enable building sdk/avdlauncher in the Win SDK."
* commit 'aae801fb1c1c298f378ed43a2ab4db2a29be2905':
  Enable building sdk/avdlauncher in the Win SDK.
2011-09-16 11:01:42 -07:00
Raphael aae801fb1c Merge "Enable building sdk/avdlauncher in the Win SDK." 2011-09-16 10:59:41 -07:00
Raphael c36df7b12b Enable building sdk/avdlauncher in the Win SDK.
Required by Change-Id Ic651e3c3 in sdk.git

Change-Id: I97f389d052ba9abf1c40547abbc6d7c164bdf405
2011-09-16 09:20:03 -07:00
Ying Wang ee29289af3 am 704c0c9f: Use LOCAL_REQUIRED_MODULES to add dependency of installed shared libraries
* commit '704c0c9fcac5f680411666835fc6bd5d052ba8db':
  Use LOCAL_REQUIRED_MODULES to add dependency of installed shared libraries
2011-09-15 16:21:00 -07:00
Ed Heyl 9b718569f0 am b8fe43be: default version
* commit 'b8fe43be2846818c38ab237d00db38c246d7f2ec':
  default version
2011-09-15 16:20:55 -07:00
Ying Wang c36b450ab1 Fix OVERRIDE_BUILT_MODULE_PATH for prebuilt shared libraries.
So that prebuilt shared libraries can be referenced with the module name
in other module's Android.mk.

Change-Id: I4c4b471696642694b805b71dd7605b91724ad924
2011-09-15 16:13:39 -07:00
Ying Wang 704c0c9fca Use LOCAL_REQUIRED_MODULES to add dependency of installed shared libraries
Bug: 5200343
Before this change the build system assumes that shared libraries will
be installed to $(TARGET_SHARED_LIBRARIES). That's not true if the
module uses custom LOCAL_MODULE_PATH.
With this change we defer the evaluation of the dependency to after all
Android.mks are loaded and all modules have their installed path
determined.

Change-Id: Ib6628ed44154a90e8668d31691fbbac67125be6c
2011-09-15 14:05:49 -07:00
Raphael 469bbdf8c3 Don't strip llvm-rs-rc in core/Makefile
This is done in development/build/sdk.atree now.

Change-Id: I2cd8e42192439851e1e42070cf74e6ee7c02ba59
2011-09-15 11:22:28 -07:00
Ed Heyl 58dcc788b9 Merge commit '4d7ddab160ba29247225e11c2092dcfd68bd6baf' into ics-factoryrom 2011-09-15 06:49:04 -07:00
Ed Heyl b8fe43be28 default version
Change-Id: I6ca2be74916b5bebffd910fdbcbefe158fdfc562
2011-09-15 04:54:20 -07:00