Commit graph

9274 commits

Author SHA1 Message Date
Keun young Park
6aae80a8d5 Merge "add mini.mk for common configurations for mini products" into jb-dev 2012-06-06 15:47:24 -07:00
Keun young Park
fd9f8bcfdb add mini.mk for common configurations for mini products
- it is used for generic pdk release

Bug: 6540216

Change-Id: I7dd21724a9484e48c66e4430cd003ffb448f075b
2012-06-06 14:15:57 -07:00
Ying Wang
f521a8e888 am 6afbda9f: Merge "Clean common intermediate files if overlay changed" into jb-dev
* commit '6afbda9f07821deed6eb110247ab56fb47dfc775':
  Clean common intermediate files if overlay changed
2012-06-06 09:44:17 -07:00
Ying Wang
6afbda9f07 Merge "Clean common intermediate files if overlay changed" into jb-dev 2012-06-06 09:41:10 -07:00
The Android Automerger
84f4b69813 JRN67B 2012-06-06 09:13:38 -07:00
The Android Automerger
989d99ab28 JRN67 2012-06-06 07:08:29 -07:00
The Android Automerger
9d6ab50c01 merge in jb-release history after reset to jb-dev 2012-06-06 06:59:23 -07:00
The Android Automerger
0296c83486 JRN66C 2012-06-05 16:25:02 -07:00
Raghu Gandham
f70dec9281 This patch addresses the following issues:
1. Fix a typo.
2. Include libffi in the MIPS list of Product Packages.
3. Default to JSC for MIPS until the MIPS support in v8 lands in aosp.
2012-06-05 15:33:37 -07:00
Ying Wang
9f4d00b94b am e534e2eb: am 47450542: Merge "Use Mac OS X SDK 10.6."
* commit 'e534e2eb2b5e79facf24c31eb2f60b8a0ee1f5b7':
  Use Mac OS X SDK 10.6.
2012-06-05 15:25:39 -07:00
Ying Wang
e534e2eb2b am 47450542: Merge "Use Mac OS X SDK 10.6."
* commit '47450542a3d07eb79c80035c701638b1f07eb1c0':
  Use Mac OS X SDK 10.6.
2012-06-05 15:23:30 -07:00
Ying Wang
47450542a3 Merge "Use Mac OS X SDK 10.6." 2012-06-05 15:14:53 -07:00
Ying Wang
644dc164cc Use Mac OS X SDK 10.6.
Change-Id: I8ca16db2fb93d350829e14f4339e7ece75a2fb54
2012-06-05 14:23:22 -07:00
Eino-Ville Talvala
97150497b3 Add LegacyCamera to SDK product
Change-Id: I690bf0ba6435c520c3de1d6fb250ffae1ae45475
2012-06-05 13:53:33 -07:00
The Android Automerger
c5c3c70c6f JRN66B 2012-06-05 10:47:19 -07:00
Jean-Baptiste Queru
c9f8b8d17e am 90beb4f1: Add some known binary owners
* commit '90beb4f155f9e0a7508854ded5b2c3dd87d702f5':
  Add some known binary owners
2012-06-05 08:23:19 -07:00
Jean-Baptiste Queru
90beb4f155 Add some known binary owners
Bug: 6611375
Change-Id: I082128ad15b277ced82c8530c17186842839a557
2012-06-05 08:08:06 -07:00
The Android Automerger
66b114dceb JRN66 2012-06-05 07:00:37 -07:00
The Android Automerger
de751ac25c merge in jb-release history after reset to jb-dev 2012-06-05 06:59:01 -07:00
Ying Wang
71004f8135 Clean common intermediate files if overlay changed
This change cleans the packages' intermediate files if their overlays
changed between incremental builds.
If two builds have different overlay, they will have different R
classes, and so the jar files in the common intermediate dirs can
not be shared. Therefore incremental build can't be applied.

This change detects the overlay changes on package's base.
If a package's overlay is different from the previous build, its common
intermediate dir is nuked.
This makes broader incremental builds possible.

Change-Id: I368610ebbbbc85a80f9aecd714ab22cd78da7f12
2012-06-04 18:02:55 -07:00
The Android Automerger
2c6cb07f43 JRN65B 2012-06-04 15:36:50 -07:00
The Android Automerger
a1fe1ab47e JRN65 2012-06-04 06:08:33 -07:00
The Android Automerger
2143ff00e6 merge in jb-release history after reset to jb-dev 2012-06-04 05:59:24 -07:00
The Android Automerger
81ae93ab2c JRN64 2012-06-03 06:12:07 -07:00
The Android Automerger
8bb6d8eb44 merge in jb-release history after reset to jb-dev 2012-06-03 05:59:39 -07:00
Ying Wang
0fb728b65a am 28a18175: Don\'t use .. to reference the target file.
* commit '28a181759079c34f8776f98f553e56554b527069':
  Don't use .. to reference the target file.
2012-06-02 09:26:47 -07:00
Ying Wang
28a1817590 Don't use .. to reference the target file.
Change-Id: I1d08db81c37853f5bf0bdf5dbe848634e6ae9f61
2012-06-02 09:22:31 -07:00
Jean-Baptiste Queru
89a0306ec3 am e7af5e24: Add Live Wallpapers to AOSP builds
* commit 'e7af5e2428d6c831acb73fac6547c3a780dca729':
  Add Live Wallpapers to AOSP builds
2012-06-02 08:35:03 -07:00
Jean-Baptiste Queru
e7af5e2428 Add Live Wallpapers to AOSP builds
Change-Id: I76df14d99fd876b765510ced8f5523e3bafce291
2012-06-01 18:27:03 -07:00
The Android Automerger
98a6ab8199 JFN53N take two 2012-06-01 16:19:57 -07:00
The Android Automerger
352fd61974 JFN53N 2012-06-01 15:10:10 -07:00
The Android Automerger
68a5d86b01 JFN53M 2012-05-31 15:54:45 -07:00
The Android Automerger
1fb843b723 JRN61B 2012-05-31 14:58:10 -07:00
Wink Saville
84690f969e am f97105ea: Merge "Fix rild running in Nakasi." into jb-dev
* commit 'f97105ea898fd4ad83ca55e391c0d512e3497b9b':
  Fix rild running in Nakasi.
2012-05-31 13:25:41 -07:00
Wink Saville
f97105ea89 Merge "Fix rild running in Nakasi." into jb-dev 2012-05-31 13:21:34 -07:00
Wink Saville
689f117b63 Fix rild running in Nakasi.
The module rild is telephony specific, since Nakasi has no radio
it shouldn't run rild. Changing the build system so rild is optional
for products that don't have telephony support.

Since rild is now optional, it is necessary to add it explicitly to
the sdk build as the sdk build is special.

Bug: 6463864
Change-Id: If944e051023b567807585fb91163a1e3f79c1024
2012-05-31 10:35:52 -07:00
The Android Automerger
1544817a1d JRN61 2012-05-31 07:10:16 -07:00
The Android Automerger
eb46ce3fe7 merge in jb-release history after reset to jb-dev 2012-05-31 06:59:29 -07:00
The Android Automerger
b77d4d999a JFN53L 2012-05-31 00:43:17 -07:00
The Android Automerger
aac25e6978 JFN53K 2012-05-31 00:11:46 -07:00
Keun young Park
53ba6b22f9 am 15d15136: Merge "change location of apns-conf.xml and vold.conf" into jb-dev
* commit '15d151367482b6ed47cecf1a578b365b7c6ccab3':
  change location of apns-conf.xml and vold.conf
2012-05-30 20:34:00 -07:00
Keun young Park
15d1513674 Merge "change location of apns-conf.xml and vold.conf" into jb-dev 2012-05-30 20:30:29 -07:00
Keun young Park
e581d866fb change location of apns-conf.xml and vold.conf
- from development/data to device/generic/goldfish/data

Change-Id: Iab7ad32b31b64f854412dd3cf23fd244a5306ed9
2012-05-30 16:32:30 -07:00
Keun young Park
dd8fe390ae am 36e4e050: Merge "add add-to-product-copy-files-if-exists for pdk" into jb-dev
* commit '36e4e050ff52956fc4afe60c156e81c2016304c4':
  add add-to-product-copy-files-if-exists for pdk
2012-05-30 16:13:43 -07:00
Keun young Park
36e4e050ff Merge "add add-to-product-copy-files-if-exists for pdk" into jb-dev 2012-05-30 16:11:06 -07:00
Keun young Park
c41c5f4e46 add add-to-product-copy-files-if-exists for pdk
Change-Id: Ib35006824de81be31652bfff220bbe4e814869ce
2012-05-30 16:03:24 -07:00
The Android Automerger
23398c8571 JRN60B 2012-05-30 16:00:12 -07:00
Jeff Brown
0e18fc47b6 am 01efddb0: Make make make faster.
* commit '01efddb0b8c641a9ebfd955173dd58e015fbe903':
  Make make make faster.
2012-05-30 15:02:56 -07:00
Jeff Brown
01efddb0b8 Make make make faster.
Optimize common case of uniq-words where the word is not
actually duplicated.  Reduces make startup overhead.

Change-Id: I1bee13bbd08a7b01248f4452283a64a724663d02
2012-05-30 13:52:22 -07:00
The Android Open Source Project
2e0f19a3fb Reconcile with jb-release nakasi-factoryrom-release
Change-Id: Iaa4109b5db2d6b15e214c05554b586e5604d9692
2012-05-30 10:12:45 -07:00