Commit graph

8891 commits

Author SHA1 Message Date
The Android Automerger
ce19307214 merge in jb-release history after reset to jb-dev 2012-05-24 06:57:40 -07:00
The Android Automerger
8e3b307726 JRN53E 2012-05-24 06:53:04 -07:00
The Android Automerger
7eb505123c JRN53D 2012-05-23 23:18:26 -07:00
The Android Automerger
8ad9c19d72 JRN53C 2012-05-23 21:37:08 -07:00
The Android Automerger
1bdbe64ad6 JRN53B 2012-05-23 17:37:06 -07:00
The Android Automerger
3fbe1e2088 JRN53 2012-05-23 07:10:16 -07:00
The Android Automerger
c1e0abf194 merge in jb-release history after reset to jb-dev 2012-05-23 06:59:23 -07:00
Ying Wang
9ccacd7a6f Set PWD to the absolute path of the top tree.
Previously PWD is passed in as a shell environmental variable,
which does not point to top of the source tree if you run mm/mmm.
That in turn breaks mm/mmm if OUT_DIR_COMMON_BASE is set to an absolute
path.

Change-Id: Iac99d5668aee1bbd3cb9897750afc2149bd9f973
2012-05-22 18:29:02 -07:00
The Android Automerger
cbd9e14eef JRN52B 2012-05-22 12:31:22 -07:00
The Android Automerger
4689e01393 JRN52 2012-05-22 07:11:08 -07:00
The Android Automerger
bbdc981a08 merge in jb-release history after reset to jb-dev 2012-05-22 06:59:23 -07:00
The Android Automerger
f39a761217 JRN51C 2012-05-21 22:02:14 -07:00
The Android Automerger
166a1135d4 JRN51B 2012-05-21 12:52:03 -07:00
The Android Automerger
1a59d4cd72 JRN51 2012-05-21 07:10:56 -07:00
The Android Automerger
ef77de23f3 merge in jb-release history after reset to jb-dev 2012-05-21 06:59:35 -07:00
The Android Automerger
3838dbadeb JRN50 2012-05-20 07:40:09 -07:00
The Android Automerger
d9eb4fd465 merge in jb-release history after reset to jb-dev 2012-05-20 07:39:35 -07:00
The Android Automerger
9690bf6a1b JRN47E 2012-05-19 11:45:04 -07:00
The Android Automerger
e8a96362b8 JRN49 2012-05-19 11:42:50 -07:00
The Android Automerger
a744652f73 JRN47E 2012-05-19 10:53:39 -07:00
The Android Automerger
f7eace6497 JRN47D 2012-05-18 15:21:39 -07:00
The Android Automerger
06fc824263 JRN48 2012-05-18 14:55:08 -07:00
The Android Automerger
783908cbae JRN47C 2012-05-17 15:51:47 -07:00
The Android Automerger
159b9d4d26 JRN47B 2012-05-17 15:05:00 -07:00
The Android Automerger
81b2eb3e3e JRN47 2012-05-17 09:27:59 -07:00
The Android Automerger
0154779948 merge in jb-release history after reset to jb-dev 2012-05-17 09:25:37 -07:00
The Android Automerger
167cbb0d32 force version reset 2012-05-17 09:25:00 -07:00
The Android Automerger
6631b2941b JRN47 2012-05-17 07:11:04 -07:00
The Android Automerger
3efaeffcf8 merge in jb-release history after reset to jb-dev 2012-05-17 06:59:25 -07:00
The Android Automerger
8246871768 JRN46D 2012-05-16 16:50:44 -07:00
The Android Automerger
4ab2f9ce86 JRN46C 2012-05-16 15:52:26 -07:00
The Android Automerger
838ebb2e94 JRN46B 2012-05-16 12:47:02 -07:00
The Android Automerger
ad13a75a5d JRN46 2012-05-16 07:10:44 -07:00
The Android Automerger
09343f4fc4 merge in jb-release history after reset to jb-dev 2012-05-16 06:59:25 -07:00
James Dong
4007faf4c6 Remove dependency of libvideoeditor_jni.so on static libs from video editor engine
related-to-bug: 6502980

Change-Id: I02a735ff4897ed386fe9c5d886260b1363a1e019
2012-05-16 01:17:42 -07:00
The Android Automerger
129c58f44b JRN45B 2012-05-15 15:51:10 -07:00
Ying Wang
f446039efb Merge "Don't set or reference LOCAL_MODULE_PATH for uninstallable modules." into jb-dev 2012-05-15 15:16:33 -07:00
James Dong
c8bfb1cad1 Revert "Remove dependency of libvideoeditor_jni.so on static libs from video editor engine"
Fixed the broken build first.

This reverts commit e85f05be14.
2012-05-15 14:47:37 -07:00
Ying Wang
6e371e426f Don't set or reference LOCAL_MODULE_PATH for uninstallable modules.
Change-Id: I98ab2f6c0d49a87aaeeba29fdf676277e4e65592
2012-05-15 14:31:26 -07:00
The Android Automerger
95d04d0652 JRN45 2012-05-15 07:11:21 -07:00
The Android Automerger
535b6a6ae7 merge in jb-release history after reset to jb-dev 2012-05-15 06:59:25 -07:00
James Dong
e85f05be14 Remove dependency of libvideoeditor_jni.so on static libs from video editor engine
related-to-bug: 6328360

Change-Id: Ia320d417497bc410f99f8ff7f11c727d1299afba
2012-05-15 00:45:45 -07:00
The Android Automerger
267de65815 JRN44C 2012-05-14 17:49:29 -07:00
The Android Automerger
5b2c7ae067 JRN44B 2012-05-14 15:57:17 -07:00
Ying Wang
3ceecfa3da Check the well-formedness of an xml file before copying.
Bug: 6491991
Change-Id: I3dbf9a7e1fefd9fea2636c78a85bae63ea8391b8
2012-05-14 14:40:58 -07:00
The Android Automerger
fe61a0bc13 JRN44 2012-05-14 07:09:46 -07:00
The Android Automerger
5b791af4f9 merge in jb-release history after reset to jb-dev 2012-05-14 06:59:29 -07:00
The Android Automerger
917fc02fb6 JRN40I 2012-05-12 14:36:59 -07:00
The Android Automerger
b705c02fe9 JRN40H take three 2012-05-11 21:30:39 -07:00
The Android Automerger
32f243670a JRN40H take two 2012-05-11 18:03:22 -07:00