OSDN Git Service
Brian Carlstrom [Fri, 28 Sep 2012 18:28:47 +0000 (11:28 -0700)]
Merge "Support LOCAL_ADDITIONAL_DEPENDENCIES for java"
Ying Wang [Fri, 28 Sep 2012 18:06:01 +0000 (11:06 -0700)]
Merge "Load only the current product config makefile."
Ying Wang [Fri, 28 Sep 2012 17:28:17 +0000 (10:28 -0700)]
am
0513c0be: am
f7592d98: Merge "Run clean steps in only given paths when using mm/mmm" into jb-mr1-dev
* commit '
0513c0bea2bef73ce3f67ef4484b920ee9a670af':
Run clean steps in only given paths when using mm/mmm
Ying Wang [Fri, 28 Sep 2012 17:25:43 +0000 (10:25 -0700)]
am
f7592d98: Merge "Run clean steps in only given paths when using mm/mmm" into jb-mr1-dev
* commit '
f7592d987d38d434a4ad1f43607a2151dad2cd4f':
Run clean steps in only given paths when using mm/mmm
Ying Wang [Fri, 28 Sep 2012 17:24:40 +0000 (10:24 -0700)]
Merge "Run clean steps in only given paths when using mm/mmm" into jb-mr1-dev
Ying Wang [Wed, 26 Sep 2012 23:00:54 +0000 (16:00 -0700)]
Run clean steps in only given paths when using mm/mmm
To speed up mm/mmm start time.
At the same time, we should copy over the other clean steps.
Bug:
7186768
Change-Id: I250e64256343afe788d79817af36eafaadb47028
Brian Carlstrom [Fri, 28 Sep 2012 17:13:30 +0000 (10:13 -0700)]
Support LOCAL_ADDITIONAL_DEPENDENCIES for java
Change-Id: Iac4b14b73e3c941b2d922e45f5698875c68134e1
Dianne Hackborn [Fri, 28 Sep 2012 07:35:27 +0000 (00:35 -0700)]
am
2e88b67d: am
0bc03946: Look, up in the sky! It\'s a bird! It\'s a plane! It\'s Android 4.2 API 17!
* commit '
2e88b67d0a5028788358e30d66870ef1ad4dd916':
Look, up in the sky! It's a bird! It's a plane! It's Android 4.2 API 17!
The Android Open Source Project [Fri, 28 Sep 2012 07:32:19 +0000 (00:32 -0700)]
am
90b65531: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
90b655315e9edcc6d253db0d06f829be55c7818e':
JOO89
JOO88C
JOO88B
Dianne Hackborn [Thu, 27 Sep 2012 23:29:14 +0000 (16:29 -0700)]
am
0bc03946: Look, up in the sky! It\'s a bird! It\'s a plane! It\'s Android 4.2 API 17!
* commit '
0bc03946889f04b333ec46ee4695a987ad7b4c0f':
Look, up in the sky! It's a bird! It's a plane! It's Android 4.2 API 17!
Ying Wang [Thu, 27 Sep 2012 20:26:25 +0000 (13:26 -0700)]
Load only the current product config makefile.
To reduce the start time.
With the change and previous change of doing clean step in only given paths,
start time of mm/mmm is reduced from ~5s to about 1s;
lunch time is reduced from ~40s to 3.5s.
Bug:
7186768,
7169854
Change-Id: Ifd72ba1c6362a5e1125a23c505fd47947ab56675
Dianne Hackborn [Thu, 27 Sep 2012 22:10:40 +0000 (15:10 -0700)]
Look, up in the sky! It's a bird! It's a plane! It's Android 4.2 API 17!
Change-Id: I577aa38525b23f297e3e2c4a745819ac87b24f6d
Ulas Kirazci [Thu, 27 Sep 2012 19:57:29 +0000 (12:57 -0700)]
Merge "Rely only on NDK libs if built against the NDK."
The Android Open Source Project [Thu, 27 Sep 2012 16:56:57 +0000 (09:56 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Ib1b937c8a7adceaa522b13529b2b6ad4bb3726aa
Ying Wang [Thu, 27 Sep 2012 16:48:17 +0000 (09:48 -0700)]
Merge "Run clean steps in only given paths when using mm/mmm"
The Android Automerger [Thu, 27 Sep 2012 14:01:47 +0000 (07:01 -0700)]
JOO89
The Android Automerger [Thu, 27 Sep 2012 13:59:14 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Thu, 27 Sep 2012 01:38:33 +0000 (18:38 -0700)]
JOO88C
Ulas Kirazci [Thu, 27 Sep 2012 00:19:01 +0000 (17:19 -0700)]
Rely only on NDK libs if built against the NDK.
Change-Id: Icf0b690181669830d3b2d19aa5b7dd6815b44bfc
Ying Wang [Wed, 26 Sep 2012 23:00:54 +0000 (16:00 -0700)]
Run clean steps in only given paths when using mm/mmm
To speed up mm/mmm start time.
At the same time, we should copy over the other clean steps.
Bug:
7186768
Change-Id: I250e64256343afe788d79817af36eafaadb47028
Dianne Hackborn [Wed, 26 Sep 2012 22:29:23 +0000 (15:29 -0700)]
am
0b366247: am
edc24bb8: Merge "Make runhat command work again." into jb-mr1-dev
* commit '
0b366247acb2828caf105567efaaa219ad5563e4':
Make runhat command work again.
Dianne Hackborn [Wed, 26 Sep 2012 22:27:14 +0000 (15:27 -0700)]
am
edc24bb8: Merge "Make runhat command work again." into jb-mr1-dev
* commit '
edc24bb89c87d88c2da530812d64ae60d59a53e9':
Make runhat command work again.
Dianne Hackborn [Wed, 26 Sep 2012 22:25:22 +0000 (15:25 -0700)]
Merge "Make runhat command work again." into jb-mr1-dev
Dianne Hackborn [Wed, 26 Sep 2012 22:00:59 +0000 (15:00 -0700)]
Make runhat command work again.
Change-Id: Ia3d2aefd32579b61da72e65c78dc6053dbaaad28
The Android Automerger [Wed, 26 Sep 2012 19:17:50 +0000 (12:17 -0700)]
JOO88B
Ying Wang [Wed, 26 Sep 2012 18:28:01 +0000 (11:28 -0700)]
Merge "Support to build executables against the NDK"
The Android Open Source Project [Wed, 26 Sep 2012 17:07:37 +0000 (10:07 -0700)]
am
48f280cf: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
48f280cf257c8cc27ffef1758dca8834c61fe14a':
JOO88
JOO87E
JOO87D
JOO87C
JOO87B
JOO87
JOO86B
The Android Open Source Project [Wed, 26 Sep 2012 17:07:32 +0000 (10:07 -0700)]
am
b11ab857: (-s ours) am
96b17f8e: am
a8a731bf: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '
b11ab8578b997a5d2bfc93b13c1c71396c60a03f':
JZO54I
The Android Open Source Project [Wed, 26 Sep 2012 16:05:51 +0000 (09:05 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I02113763b6c6dfd96cf69377e244412d647a54f4
The Android Open Source Project [Wed, 26 Sep 2012 16:01:43 +0000 (09:01 -0700)]
am
96b17f8e: am
a8a731bf: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '
96b17f8e9972cb69e2ae8ce9cb137ecc6ca7763a':
JZO54I
The Android Open Source Project [Wed, 26 Sep 2012 16:00:24 +0000 (09:00 -0700)]
am
a8a731bf: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '
a8a731bf7fe8d42af56c7481acd99628dd1df2f0':
JZO54I
The Android Open Source Project [Wed, 26 Sep 2012 15:58:17 +0000 (08:58 -0700)]
Reconcile with jb-mr0-release - do not merge
Change-Id: Ia744536ee9da563e661fdcd84defb22720d76309
The Android Automerger [Wed, 26 Sep 2012 14:01:24 +0000 (07:01 -0700)]
JOO88
The Android Automerger [Wed, 26 Sep 2012 13:59:09 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 26 Sep 2012 04:50:16 +0000 (21:50 -0700)]
JZO54I
The Android Automerger [Wed, 26 Sep 2012 03:46:44 +0000 (20:46 -0700)]
JOO87E
Ying Wang [Wed, 26 Sep 2012 00:52:10 +0000 (17:52 -0700)]
Support to build executables against the NDK
Use "LOCAL_SDK_VERSION := <number>" to build against the NDK when you
include $(BUILD_EXECUTABLE).
Bug:
7170098
Change-Id: I4cebeae3355e79a4d2f2f5549ef0613ced77e3f0
The Android Automerger [Wed, 26 Sep 2012 00:34:26 +0000 (17:34 -0700)]
JOO87D
The Android Automerger [Tue, 25 Sep 2012 21:43:33 +0000 (14:43 -0700)]
JOO87C
The Android Automerger [Tue, 25 Sep 2012 18:06:38 +0000 (11:06 -0700)]
JOO87B
The Android Automerger [Tue, 25 Sep 2012 18:05:45 +0000 (11:05 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Tue, 25 Sep 2012 14:02:05 +0000 (07:02 -0700)]
JOO87
The Android Automerger [Tue, 25 Sep 2012 13:59:14 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Ying Wang [Wed, 5 Sep 2012 19:48:52 +0000 (12:48 -0700)]
Don't install all host modules by default.
Instead we should explicitly set up the dependency, if the module will
be used in the build process; Use LOCAL_MODULE_TAGS with eng, debug or
tests if the module is for testing; or add to PRODUCT_PACKAGES if it's
required by a product.
Change-Id: I326e97df6630dee4acc6582ce6cef2dec8289155
The Android Automerger [Mon, 24 Sep 2012 23:47:29 +0000 (16:47 -0700)]
JOO86B
Bart Sears [Mon, 24 Sep 2012 20:10:42 +0000 (13:10 -0700)]
am
01cf231c: am
0b7e0983: Merge "Add the new NanumGothic makefile to the build" into jb-mr1-dev
* commit '
01cf231cbafe5cfba571535f967bcc5d1830385f':
Add the new NanumGothic makefile to the build
Bart Sears [Mon, 24 Sep 2012 20:08:14 +0000 (13:08 -0700)]
am
0b7e0983: Merge "Add the new NanumGothic makefile to the build" into jb-mr1-dev
* commit '
0b7e0983d4dab0796fd37439859250c88142463b':
Add the new NanumGothic makefile to the build
Bart Sears [Mon, 24 Sep 2012 20:06:06 +0000 (13:06 -0700)]
Merge "Add the new NanumGothic makefile to the build" into jb-mr1-dev
Siva Velusamy [Mon, 24 Sep 2012 19:50:23 +0000 (12:50 -0700)]
am
b01402e3: am
53e71420: Revert "Include videoeditor_jni in sdk product build."
* commit '
b01402e3b47348b9b695be63b0f37162fba0caee':
Revert "Include videoeditor_jni in sdk product build."
Siva Velusamy [Mon, 24 Sep 2012 19:49:21 +0000 (12:49 -0700)]
am
53e71420: Revert "Include videoeditor_jni in sdk product build."
* commit '
53e714209b32599a1fe19a1827f313207e43fd52':
Revert "Include videoeditor_jni in sdk product build."
Siva Velusamy [Fri, 21 Sep 2012 22:23:58 +0000 (15:23 -0700)]
Revert "Include videoeditor_jni in sdk product build."
This reverts commit
997e629d6dca5683af596ba22f564b5346967b95.
The Android Open Source Project [Mon, 24 Sep 2012 17:13:02 +0000 (10:13 -0700)]
am
5cf79292: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
5cf79292b8838880e6059bca7e2415161d0dfb84':
JOO86
JOO85B
JOO85
JOO84
JOO83C
Include videoeditor_jni in sdk product build.
JOO83B
JOO83
fix PDK build
Use prebuilt for PDK builds.
JOO82C
JOO82B
The Android Open Source Project [Mon, 24 Sep 2012 17:11:22 +0000 (10:11 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Idb9359eee8e8aafd50f8bec1202536d842ac8cbb
Ying Wang [Mon, 24 Sep 2012 17:01:34 +0000 (10:01 -0700)]
Merge "Clean up intermediate files for adbd and init in installclean."
The Android Open Source Project [Mon, 24 Sep 2012 16:39:52 +0000 (09:39 -0700)]
am
1e442932: (-s ours) am
cc71f1ea: am
d50926a0: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '
1e442932f876bacc96147093c2c37074e590519a':
JZO54H
The Android Open Source Project [Mon, 24 Sep 2012 16:29:40 +0000 (09:29 -0700)]
am
cc71f1ea: am
d50926a0: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '
cc71f1ea0b090903ea0c9a5b71b1a440c26de101':
JZO54H
Ying Wang [Mon, 24 Sep 2012 15:49:05 +0000 (08:49 -0700)]
am
9766b73c: am
f8f2b022: Ignore support library Proguard warning
* commit '
9766b73c8847d85341c18c8e217a28c8de57ba28':
Ignore support library Proguard warning
Ying Wang [Mon, 24 Sep 2012 15:27:32 +0000 (08:27 -0700)]
am
f8f2b022: Ignore support library Proguard warning
* commit '
f8f2b022e9e6ea218d60eb692ede3e6e48c944af':
Ignore support library Proguard warning
The Android Open Source Project [Mon, 24 Sep 2012 15:26:41 +0000 (08:26 -0700)]
am
d50926a0: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '
d50926a047d51f950cbe6c7588d4b168e0cfc3bb':
JZO54H
The Android Open Source Project [Mon, 24 Sep 2012 14:38:53 +0000 (07:38 -0700)]
Reconcile with jb-mr0-release - do not merge
Change-Id: I41bb7c5875f0eef1fd8c31f98f628718a966eddc
The Android Automerger [Mon, 24 Sep 2012 13:59:50 +0000 (06:59 -0700)]
JOO86
The Android Automerger [Mon, 24 Sep 2012 13:59:02 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Siva Velusamy [Mon, 24 Sep 2012 07:49:55 +0000 (00:49 -0700)]
am
918c56c7: am
32130c6d: Merge "Include videoeditor_jni in sdk product build." into jb-mr1-dev
* commit '
918c56c7a157b56ea0dc037786627a8101e15cfe':
Include videoeditor_jni in sdk product build.
Scott Main [Mon, 24 Sep 2012 07:49:45 +0000 (00:49 -0700)]
am
9b423a82: am
57a0a4c1: am
dcce7ca6: am
582db97b: add style for code captions; ignore sidenav headers for HRs
* commit '
9b423a82d823f3516fcd969ac2cbc6c04e04e281':
add style for code captions; ignore sidenav headers for HRs
Bart Sears [Mon, 24 Sep 2012 07:11:00 +0000 (00:11 -0700)]
Add the new NanumGothic makefile to the build
There are separate CLs to add the NanumGothic font files
and makefiles.
Bug:
4531601
Change-Id: Id27f9ff6eb45f666f7f62f1dbe7a06c96c0a717e
The Android Automerger [Mon, 24 Sep 2012 02:00:36 +0000 (19:00 -0700)]
JOO85B
The Android Automerger [Mon, 24 Sep 2012 01:59:34 +0000 (18:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Ying Wang [Sun, 23 Sep 2012 20:46:58 +0000 (13:46 -0700)]
Ignore support library Proguard warning
The support library contains references to newer platform versions.
Don't warn about those in case this app is linking against an older
platform version. We know about them, and they are safe.
Change-Id: Ia2a90398b1db1858d005ec09ded56751cc6ffb00
The Android Automerger [Sun, 23 Sep 2012 13:59:48 +0000 (06:59 -0700)]
JOO85
The Android Automerger [Sun, 23 Sep 2012 13:59:04 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Sat, 22 Sep 2012 16:44:00 +0000 (09:44 -0700)]
JOO84
The Android Automerger [Sat, 22 Sep 2012 16:41:22 +0000 (09:41 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Sat, 22 Sep 2012 01:02:14 +0000 (18:02 -0700)]
JZO54H
The Android Automerger [Fri, 21 Sep 2012 23:26:24 +0000 (16:26 -0700)]
JOO83C
Siva Velusamy [Fri, 21 Sep 2012 21:09:57 +0000 (14:09 -0700)]
Include videoeditor_jni in sdk product build.
frameworks/base/media depends on libvideoeditor_jni. This change
copies the dependencies from generic_no_telephony.mk
Fixes Bug
7200384
Change-Id: I135fd4fc613d81aa962bcdf2573894a2ea8ab11d
The Android Automerger [Fri, 21 Sep 2012 22:40:59 +0000 (15:40 -0700)]
JOO83B
Siva Velusamy [Fri, 21 Sep 2012 22:02:12 +0000 (15:02 -0700)]
am
32130c6d: Merge "Include videoeditor_jni in sdk product build." into jb-mr1-dev
* commit '
32130c6d092223ba91ab4425fe2c40e9e6fde584':
Include videoeditor_jni in sdk product build.
Siva Velusamy [Fri, 21 Sep 2012 22:00:27 +0000 (15:00 -0700)]
Merge "Include videoeditor_jni in sdk product build." into jb-mr1-dev
Scott Main [Fri, 21 Sep 2012 21:58:20 +0000 (14:58 -0700)]
am
57a0a4c1: am
dcce7ca6: am
582db97b: add style for code captions; ignore sidenav headers for HRs
* commit '
57a0a4c1fe29a2fe5fea924bd87554380bc70a9a':
add style for code captions; ignore sidenav headers for HRs
Scott Main [Fri, 21 Sep 2012 21:56:35 +0000 (14:56 -0700)]
am
dcce7ca6: am
582db97b: add style for code captions; ignore sidenav headers for HRs
* commit '
dcce7ca6a82cf08a7047d0fd23ba05b47be831c1':
add style for code captions; ignore sidenav headers for HRs
Scott Main [Fri, 21 Sep 2012 21:54:09 +0000 (14:54 -0700)]
am
582db97b: add style for code captions; ignore sidenav headers for HRs
* commit '
582db97b23982f8e9cac7926ac3f5806b6a9cc71':
add style for code captions; ignore sidenav headers for HRs
Scott Main [Fri, 21 Sep 2012 21:33:43 +0000 (14:33 -0700)]
add style for code captions;
ignore sidenav headers for HRs
Change-Id: I6eb11d3629dd13d2c7ac297cc9fa3828ed59f170
Siva Velusamy [Fri, 21 Sep 2012 21:09:57 +0000 (14:09 -0700)]
Include videoeditor_jni in sdk product build.
frameworks/base/media depends on libvideoeditor_jni. This change
copies the dependencies from generic_no_telephony.mk
Fixes Bug
7200384
Change-Id: I135fd4fc613d81aa962bcdf2573894a2ea8ab11d
Ying Wang [Fri, 21 Sep 2012 21:11:41 +0000 (14:11 -0700)]
Clean up intermediate files for adbd and init in installclean.
They are really exceptions and we shouldn't do that in general.
Bug:
7170444
Change-Id: I7163181e495c52db9aa62a360309d8973df1985f
The Android Automerger [Fri, 21 Sep 2012 14:01:59 +0000 (07:01 -0700)]
JOO83
The Android Automerger [Fri, 21 Sep 2012 13:59:15 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Ying Wang [Fri, 21 Sep 2012 03:30:58 +0000 (20:30 -0700)]
am
d4f85b6a: am
20a7c2c1: Merge "Allow to tag owner to PRODUCT_COPY_FILES" into jb-mr1-dev
* commit '
d4f85b6a2b213c59f9d95377bda6342c225ce1a8':
Allow to tag owner to PRODUCT_COPY_FILES
Zhihai Xu [Fri, 21 Sep 2012 03:30:57 +0000 (20:30 -0700)]
am
0ed78ec7: am
d81b9d22: Merge "ISSUE
6849488 Bluedroid stack, remove system/bluetooth." into jb-mr1-dev
* commit '
0ed78ec7c4b659a1b6b0bd5e39428f882411a0ff':
ISSUE
6849488 Bluedroid stack, remove system/bluetooth.
Ying Wang [Fri, 21 Sep 2012 03:22:38 +0000 (20:22 -0700)]
am
20a7c2c1: Merge "Allow to tag owner to PRODUCT_COPY_FILES" into jb-mr1-dev
* commit '
20a7c2c10d892ebb8d128794e862ad17ef1056e2':
Allow to tag owner to PRODUCT_COPY_FILES
Zhihai Xu [Fri, 21 Sep 2012 03:22:37 +0000 (20:22 -0700)]
am
d81b9d22: Merge "ISSUE
6849488 Bluedroid stack, remove system/bluetooth." into jb-mr1-dev
* commit '
d81b9d220e00a9ffecea3b9067c6416b2c1e6bbd':
ISSUE
6849488 Bluedroid stack, remove system/bluetooth.
Keun young Park [Thu, 20 Sep 2012 20:50:02 +0000 (13:50 -0700)]
fix PDK build
- build tools not coming from prebuilts for PDK
Change-Id: I5760a54f502b8aa2167976c8f1e17412f31c6f5f
Ying Wang [Thu, 20 Sep 2012 17:37:39 +0000 (10:37 -0700)]
Use prebuilt for PDK builds.
Change-Id: Ief723fe137b7a3aa051837e3ca1079fea772357d
The Android Automerger [Fri, 21 Sep 2012 00:46:51 +0000 (17:46 -0700)]
JOO82C
Ying Wang [Fri, 21 Sep 2012 00:12:00 +0000 (17:12 -0700)]
Merge "Allow to tag owner to PRODUCT_COPY_FILES" into jb-mr1-dev
Zhihai Xu [Thu, 20 Sep 2012 23:42:46 +0000 (16:42 -0700)]
Merge "ISSUE
6849488 Bluedroid stack, remove system/bluetooth." into jb-mr1-dev
Ying Wang [Thu, 20 Sep 2012 23:35:36 +0000 (16:35 -0700)]
Allow to tag owner to PRODUCT_COPY_FILES
PRODUCT_COPY_FILES now is a list of words like <source
path>:<destination path>[:<owner>].
The optional :<owner> is used to indicate the owner of a vendor file.
Bug:
7048854
Change-Id: I435d1e18b7a091fb62513062cfc2e420e51557ec
Keun young Park [Thu, 20 Sep 2012 22:46:14 +0000 (15:46 -0700)]
am
62526137: am
fe1d3b12: Merge "fix PDK build" into jb-mr1-dev
* commit '
62526137891e38aceb8562459a85eef1a73c3856':
fix PDK build
Ying Wang [Thu, 20 Sep 2012 22:46:06 +0000 (15:46 -0700)]
am
a49a4d34: am
7884dfc6: Merge "Move AndroidConfig.h from system/core to the build project." into jb-mr1-dev
* commit '
a49a4d3461fba91e9da0049863f812ddb8ffc8e2':
Move AndroidConfig.h from system/core to the build project.
The Android Automerger [Thu, 20 Sep 2012 21:44:11 +0000 (14:44 -0700)]
JOO82B
Keun young Park [Thu, 20 Sep 2012 21:36:44 +0000 (14:36 -0700)]
am
fe1d3b12: Merge "fix PDK build" into jb-mr1-dev
* commit '
fe1d3b12de3b9dad5fa1b84115602bd6e9f32767':
fix PDK build