Commit Graph

9035 Commits

Author SHA1 Message Date
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
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
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
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
The Android Automerger 1347ee6aff JRN60 2012-05-30 07:10:33 -07:00
The Android Automerger 935f4ed555 merge in jb-release history after reset to jb-dev 2012-05-30 06:59:32 -07:00
The Android Automerger 70efb21cce JRN59D 2012-05-29 21:53:55 -07:00
The Android Automerger 0dcdc13763 JRN59C 2012-05-29 19:48:47 -07:00
The Android Automerger 291644e258 JFN53J 2012-05-29 19:45:42 -07:00
Keun young Park 2e64f64c9b am 3e93aeae: add platform.zip from platform-java to dist
* commit '3e93aeae10aa70ab64e78fbab0bb8741d0b04d99':
  add platform.zip from platform-java to dist
2012-05-29 18:28:00 -07:00
Keun young Park 3e93aeae10 add platform.zip from platform-java to dist
Change-Id: I08e110edf70ef5ec313ee02e03803fa152f0aa6a
2012-05-29 18:13:39 -07:00
The Android Automerger d9a65fd160 JRN59B 2012-05-29 15:50:42 -07:00
Ying Wang a9b484ad0e am 82eb7082: Fix typo.
* commit '82eb7082aa9b7239770f1631211a3c18b6daacfe':
  Fix typo.
2012-05-29 13:44:13 -07:00
Ying Wang 82eb7082aa Fix typo.
Change-Id: Id4b619e3fff8d801c4662d9cb2719576c370a503
2012-05-29 13:42:18 -07:00
The Android Open Source Project 679b1c031f Reconcile with jb-release nakasi-factoryrom-release
Change-Id: I804144e79bf82b1d6d1f9e6dc9073249aad597f0
2012-05-29 09:39:20 -07:00
The Android Automerger 2e05f1ddf5 JRN59 2012-05-29 09:05:39 -07:00
The Android Automerger a437192620 merge in jb-release history after reset to jb-dev 2012-05-29 08:54:56 -07:00
The Android Automerger f26c49d1c9 JRN54F 2012-05-25 15:31:30 -07:00
The Android Automerger 117bfe3695 JRN54E 2012-05-25 15:12:01 -07:00
The Android Automerger 5ccec8a0ab JFN53I 2012-05-25 15:02:41 -07:00
Keun young Park f89cd6689c am d8de82fb: ignore touch error happening from broken symbolic link
* commit 'd8de82fbca4371ccefb41e02ac737e3a153901b3':
  ignore touch error happening from broken symbolic link
2012-05-25 14:04:35 -07:00
Keun young Park d8de82fbca ignore touch error happening from broken symbolic link
- maguro platform.zip contains hdcp.keys symbolic link which is broken except env with the key
- this causes error in the touch

Bug: 6555557
Change-Id: I5f9ff5d57c87c0d3038545eeba3b553445a8493c
2012-05-25 12:22:22 -07:00
The Android Automerger 98d83b518e JRN54D 2012-05-25 12:21:49 -07:00
The Android Automerger cea11997a6 JFN53H 2012-05-25 11:25:04 -07:00
The Android Automerger fc3b84a19a JRN54C 2012-05-25 11:14:20 -07:00
Jean-Baptiste Queru fe5d7c788b am a2bfde63: am fed2587c: Merge "dalvik heapsize: Remove obsolete flag, set porperty"
* commit 'a2bfde63b767378979145cb8be55d9a305e2b4f5':
  dalvik heapsize: Remove obsolete flag, set porperty
2012-05-25 07:19:55 -07:00
Jean-Baptiste Queru 4261ace013 resolved conflicts for merge of 9f312b81 to jb-dev-plus-aosp
Change-Id: I4589e38d0a2d35f84f16e00dd9cffa02b25ebf98
2012-05-25 07:16:04 -07:00
The Android Automerger 3d46807447 JFN53G 2012-05-24 23:04:31 -07:00
The Android Automerger 567b3e41c4 JRN54B 2012-05-24 22:41:54 -07:00
The Android Automerger 49bb051ab5 JFN53F 2012-05-24 16:54:23 -07:00
Jean-Baptiste Queru a2bfde63b7 am fed2587c: Merge "dalvik heapsize: Remove obsolete flag, set porperty"
* commit 'fed2587c164d27de79ca7900e920a15cbf62f990':
  dalvik heapsize: Remove obsolete flag, set porperty
2012-05-24 14:27:52 -07:00
Jean-Baptiste Queru 9f312b8156 am 3deea32a: Merge "Enable DRM support in the SDK system image"
* commit '3deea32a31e16d92d1d632b5a1bd260416f6e7d5':
  Enable DRM support in the SDK system image
2012-05-24 14:27:51 -07:00
Keun young Park 2b9a7982e1 am ac440901: Merge "enable PDK to use platform JAVA API" into jb-dev
* commit 'ac44090133e4e3a674be831d28d6d8cc661d2472':
  enable PDK to use platform JAVA API
2012-05-24 12:54:57 -07:00
Keun young Park ac44090133 Merge "enable PDK to use platform JAVA API" into jb-dev 2012-05-24 12:53:07 -07:00
Jean-Baptiste Queru fed2587c16 Merge "dalvik heapsize: Remove obsolete flag, set porperty" 2012-05-24 12:38:34 -07:00
Bruce Beare 5b21303927 dalvik heapsize: Remove obsolete flag, set porperty
Change-Id: I51360867171aaebce071b3391678ff6e7f191dc5
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2012-05-24 11:38:18 -07:00
Keun young Park 816b9fd4e2 enable PDK to use platform JAVA API
- make platform-java will add necessary Java stuffs from out/target/common/
  to platform.zip
- make platform works as before: no Java libraries
- normal fusion build will pick up the file, and define TARGET_BUILD_PDK_JAVA
  besides TARGET_BUILD_PDK if Java stuffs are included
- For TARGET_BUILD_PDK_JAVA, java.mk does not touch LOCAL_SDK_VERSION, which will lead into
  pulling non-SDK Java APIs

Bug: 6482799

Change-Id: I90b1a0b06dc774150711680a6612f2b97b9eab3f
2012-05-24 11:19:31 -07:00
The Android Automerger d3969b627a JFN53E 2012-05-24 10:23:17 -07:00
The Android Automerger e11c85e463 merge in nakasi-factoryrom-release history after reset to jb-dev 2012-05-24 10:15:38 -07:00
Jean-Baptiste Queru 3deea32a31 Merge "Enable DRM support in the SDK system image" 2012-05-24 10:14:05 -07:00