OSDN Git Service
The Android Automerger [Thu, 10 Oct 2013 23:27:26 +0000 (16:27 -0700)]
"KRT10C"
The Android Automerger [Thu, 10 Oct 2013 19:17:09 +0000 (12:17 -0700)]
"KRT10B"
The Android Automerger [Thu, 10 Oct 2013 13:02:56 +0000 (06:02 -0700)]
"KRT10"
The Android Automerger [Thu, 10 Oct 2013 13:00:28 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
The Android Automerger [Wed, 9 Oct 2013 21:31:23 +0000 (14:31 -0700)]
KRT09B
The Android Automerger [Wed, 9 Oct 2013 13:03:26 +0000 (06:03 -0700)]
"KRT09"
The Android Automerger [Wed, 9 Oct 2013 13:00:32 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
The Android Automerger [Tue, 8 Oct 2013 23:20:36 +0000 (16:20 -0700)]
"KRT08C"
Ed Heyl [Tue, 8 Oct 2013 22:56:09 +0000 (15:56 -0700)]
merge in KFS78N (no-op)
Ed Heyl [Tue, 8 Oct 2013 22:35:32 +0000 (15:35 -0700)]
merge in KQS81M
Jamie Gennis [Tue, 8 Oct 2013 22:08:54 +0000 (22:08 +0000)]
Merge "BoardConfig: Add and document vsync phase offset setting" into klp-dev
The Android Automerger [Tue, 8 Oct 2013 21:20:33 +0000 (14:20 -0700)]
"KRT08B"
Dianne Hackborn [Thu, 3 Oct 2013 18:41:08 +0000 (11:41 -0700)]
So long Key Lime Pie, it was nice knowing you.
Now we are KitKat.
I mean Android 4.4 API 19.
Or whatever.
Bug:
10348975
Change-Id: Ic0fa9c82277bb6d6fb79e6095b5ec0e9eb35a04a
The Android Automerger [Tue, 8 Oct 2013 13:02:29 +0000 (06:02 -0700)]
"KRT08"
The Android Automerger [Tue, 8 Oct 2013 13:00:18 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
Jamie Gennis [Sun, 6 Oct 2013 23:02:02 +0000 (16:02 -0700)]
BoardConfig: Add and document vsync phase offset setting
Bug:
10624956
Change-Id: I82def5730f9d09396809d4b8cd2ea44829b21f22
The Android Automerger [Mon, 7 Oct 2013 23:33:42 +0000 (16:33 -0700)]
"KRT07B"
The Android Automerger [Mon, 7 Oct 2013 17:47:43 +0000 (10:47 -0700)]
KQS81M
The Android Automerger [Mon, 7 Oct 2013 13:01:22 +0000 (06:01 -0700)]
"KRT07"
The Android Automerger [Mon, 7 Oct 2013 13:00:11 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
The Android Automerger [Sun, 6 Oct 2013 13:03:38 +0000 (06:03 -0700)]
"KRT06"
The Android Automerger [Sun, 6 Oct 2013 13:00:49 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
The Android Automerger [Sat, 5 Oct 2013 01:23:52 +0000 (18:23 -0700)]
"KRT03H"
The Android Automerger [Fri, 4 Oct 2013 23:19:52 +0000 (16:19 -0700)]
"KRT03G"
The Android Automerger [Fri, 4 Oct 2013 20:25:00 +0000 (13:25 -0700)]
"KRT03F"
The Android Automerger [Fri, 4 Oct 2013 19:51:23 +0000 (12:51 -0700)]
"KQS81L"
The Android Automerger [Fri, 4 Oct 2013 17:35:52 +0000 (10:35 -0700)]
"KRT03E"
The Android Automerger [Fri, 4 Oct 2013 02:01:35 +0000 (19:01 -0700)]
"KRT03D"
The Android Automerger [Thu, 3 Oct 2013 22:18:43 +0000 (15:18 -0700)]
"KRT03C"
The Android Automerger [Thu, 3 Oct 2013 20:37:28 +0000 (13:37 -0700)]
"KRT03B"
Dianne Hackborn [Thu, 3 Oct 2013 18:41:08 +0000 (11:41 -0700)]
So long Key Lime Pie, it was nice knowing you.
Now we are KitKat.
I mean Android 4.4 API 19.
Or whatever.
Bug:
10348975
Change-Id: Ic0fa9c82277bb6d6fb79e6095b5ec0e9eb35a04a
The Android Automerger [Thu, 3 Oct 2013 13:04:43 +0000 (06:04 -0700)]
"KRT03"
The Android Automerger [Thu, 3 Oct 2013 13:01:24 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
The Android Automerger [Thu, 3 Oct 2013 01:42:40 +0000 (18:42 -0700)]
"KQS81K"
Colin Cross [Thu, 3 Oct 2013 00:47:50 +0000 (00:47 +0000)]
Merge "don't check paths of non-installed or host modules" into klp-dev
The Android Automerger [Wed, 2 Oct 2013 23:35:12 +0000 (16:35 -0700)]
"KQS81J"
Justin Koh [Wed, 2 Oct 2013 23:13:17 +0000 (23:13 +0000)]
Merge "Move DownloadProviderUi from core_minimal to core.mk" into klp-dev
Colin Cross [Wed, 2 Oct 2013 22:16:35 +0000 (15:16 -0700)]
don't check paths of non-installed or host modules
Static libraries and host modules are not installed under
TARGET_OUT_VENDOR and don't need to be, relax the checks.
Change-Id: Ia8b926d466420a8b6dd418d5e95fdf5ff919e078
The Android Automerger [Wed, 2 Oct 2013 21:44:57 +0000 (14:44 -0700)]
"KRT02B"
Justin Koh [Wed, 2 Oct 2013 21:32:15 +0000 (14:32 -0700)]
Move DownloadProviderUi from core_minimal to core.mk
Move DownloadProviderUi from core_minimal to core.mk. This UI requires
DocumentsUi so it doesn't make sense to ship it on devices which are only
using core_minimal.
Change-Id: Id8a4f2a9835a05e9281596dbd5ca7b8e76062cd4
Chris Wren [Wed, 2 Oct 2013 17:30:27 +0000 (13:30 -0400)]
support protos in host java libraries
Change-Id: Ia4499d439ea23ee4d6707cfb005b7230c0a2374f
Ying Wang [Wed, 2 Oct 2013 18:14:56 +0000 (11:14 -0700)]
am
164a9639: am
9e8b6c42: am
3d48d9c3: Allow to run checkbuild in sdk build.
* commit '
164a963962b7b2816bb92016c6ce0ff52ac93c43':
Allow to run checkbuild in sdk build.
Ying Wang [Wed, 2 Oct 2013 18:13:13 +0000 (11:13 -0700)]
am
9e8b6c42: am
3d48d9c3: Allow to run checkbuild in sdk build.
* commit '
9e8b6c429d9d17d8251ae8aa15c6de2420732431':
Allow to run checkbuild in sdk build.
Ying Wang [Wed, 2 Oct 2013 18:11:13 +0000 (11:11 -0700)]
am
3d48d9c3: Allow to run checkbuild in sdk build.
* commit '
3d48d9c36b2d2cd696d3ee2656939e77ca5ba950':
Allow to run checkbuild in sdk build.
Ying Wang [Thu, 27 Jun 2013 00:56:08 +0000 (17:56 -0700)]
Allow to run checkbuild in sdk build.
Bug:
9594464
Change-Id: Ia02e7d8fc157cdfe2e065ce9e42a3800457f89f6
(cherry picked from commit
fcec57a1165dc78ca2630c017dd95bddce31e55a)
The Android Automerger [Wed, 2 Oct 2013 13:02:34 +0000 (06:02 -0700)]
"KRT02"
The Android Automerger [Wed, 2 Oct 2013 13:00:41 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
Ying Wang [Wed, 2 Oct 2013 01:16:45 +0000 (18:16 -0700)]
Add the FRAMEWORKS_BASE_JAVA_SRC_DIRS to aidl includes
only if the module is built against the platform, not the SDK.
Previously it added it if it's doing a platform build.
But we can do an apps_only build inside the platform source tree and
such a build may build modules against the platform.
This fixes the apps build in the platform source tree.
Change-Id: I73e32a8f0e505349790a102321f88e77fba472cd
The Android Automerger [Tue, 1 Oct 2013 22:39:38 +0000 (15:39 -0700)]
"KRT01B"
The Android Automerger [Tue, 1 Oct 2013 16:25:25 +0000 (09:25 -0700)]
"KRT01"
The Android Automerger [Tue, 1 Oct 2013 16:25:06 +0000 (09:25 -0700)]
merge in klp-release history after reset to klp-dev
The Android Automerger [Tue, 1 Oct 2013 14:47:29 +0000 (07:47 -0700)]
"KRT81"
The Android Automerger [Tue, 1 Oct 2013 14:47:14 +0000 (07:47 -0700)]
merge in klp-release history after reset to klp-dev
The Android Automerger [Tue, 1 Oct 2013 13:02:39 +0000 (06:02 -0700)]
"KRT01"
The Android Automerger [Tue, 1 Oct 2013 13:00:23 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
The Android Automerger [Tue, 1 Oct 2013 04:00:24 +0000 (21:00 -0700)]
"KQS81I"
Ben Gilad [Mon, 30 Sep 2013 23:54:17 +0000 (16:54 -0700)]
Replace a dangling refeence to packages/apps/Phone.
Change-Id: I47b68510d19ccbaa2fc125c2a422fd1e857ec18e
The Android Automerger [Mon, 30 Sep 2013 23:37:26 +0000 (16:37 -0700)]
"KRS92B"
The Android Automerger [Mon, 30 Sep 2013 13:01:11 +0000 (06:01 -0700)]
"KRS92"
The Android Automerger [Mon, 30 Sep 2013 13:00:07 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
The Android Automerger [Sun, 29 Sep 2013 22:11:18 +0000 (15:11 -0700)]
KRS91B
The Android Automerger [Sun, 29 Sep 2013 21:43:12 +0000 (14:43 -0700)]
"KFS78N"
The Android Automerger [Sun, 29 Sep 2013 20:33:42 +0000 (13:33 -0700)]
"KQS81H"
The Android Automerger [Sun, 29 Sep 2013 13:03:21 +0000 (06:03 -0700)]
"KRS91"
The Android Automerger [Sun, 29 Sep 2013 13:00:40 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
The Android Automerger [Sun, 29 Sep 2013 02:40:24 +0000 (19:40 -0700)]
KFS78M
The Android Automerger [Fri, 27 Sep 2013 22:47:55 +0000 (15:47 -0700)]
"KRS88G"
The Android Automerger [Fri, 27 Sep 2013 22:22:49 +0000 (15:22 -0700)]
"KRS88F"
The Android Automerger [Fri, 27 Sep 2013 18:31:20 +0000 (11:31 -0700)]
"KRS88E"
The Android Automerger [Fri, 27 Sep 2013 00:14:01 +0000 (17:14 -0700)]
"KRS88D"
The Android Automerger [Thu, 26 Sep 2013 23:37:46 +0000 (16:37 -0700)]
"KRS88C"
The Android Automerger [Thu, 26 Sep 2013 22:04:24 +0000 (15:04 -0700)]
"KRS88B"
The Android Automerger [Thu, 26 Sep 2013 13:03:45 +0000 (06:03 -0700)]
"KRS88"
The Android Automerger [Thu, 26 Sep 2013 13:00:47 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
The Android Automerger [Thu, 26 Sep 2013 05:14:47 +0000 (22:14 -0700)]
KQS81G
The Android Automerger [Thu, 26 Sep 2013 04:34:22 +0000 (21:34 -0700)]
KQS81F
Justin Ho [Thu, 19 Sep 2013 21:46:55 +0000 (14:46 -0700)]
Remove Email from HH FactoryROM
Bug:
10806060
Change-Id: I037f2886fbcdc6f444140b4ded3594a41ecefd1e
The Android Automerger [Wed, 25 Sep 2013 22:03:30 +0000 (15:03 -0700)]
"KRS87B"
The Android Automerger [Wed, 25 Sep 2013 20:08:12 +0000 (13:08 -0700)]
KQS81E
Ying Wang [Wed, 25 Sep 2013 19:37:19 +0000 (12:37 -0700)]
am
b6da30c3: am
2408479c: Allow module to specify LOCAL_INSTALLED_MODULE_STEM
* commit '
b6da30c3724cc2a452be2c1ae425eff4f7d55944':
Allow module to specify LOCAL_INSTALLED_MODULE_STEM
Baligh Uddin [Wed, 25 Sep 2013 19:37:18 +0000 (12:37 -0700)]
am
55dc7844: am
d21a641f: (-s ours) am
fe66c390: bump version to 4.3.1
* commit '
55dc78446e4a3f8048d28bb78a7b9f2b988494bf':
bump version to 4.3.1
Ying Wang [Wed, 25 Sep 2013 19:35:04 +0000 (12:35 -0700)]
am
2408479c: Allow module to specify LOCAL_INSTALLED_MODULE_STEM
* commit '
2408479cf9cf9cfe87e464e9b5d2f36143818d37':
Allow module to specify LOCAL_INSTALLED_MODULE_STEM
Baligh Uddin [Wed, 25 Sep 2013 19:35:04 +0000 (12:35 -0700)]
am
d21a641f: (-s ours) am
fe66c390: bump version to 4.3.1
* commit '
d21a641fb4c27fdba21b72116a4e5e722a7acf6f':
bump version to 4.3.1
Ying Wang [Tue, 24 Sep 2013 22:56:11 +0000 (15:56 -0700)]
Allow module to specify LOCAL_INSTALLED_MODULE_STEM
With this change, you can install a shared library with module name foo
as bar.so to the system.img with:
LOCAL_INSTALLED_MODULE_STEM := bar.so
Note that we in general still disallow a static/shared library to
specify LOCAL_MODULE_STEM or LOCAL_BUILT_MODULE_STEM, because the build
system uses LOCAL_MODULE to compute build time dependencies, such as
export_includes, the -l linker flag etc.
Also, if you use LOCAL_INSTALLED_MODULE_STEM to change the installed
file name and if any other module links against this library, you may
run into runtime error: the library name baked in to the binary is not
the same as file name in the system image.
Change-Id: I55b571c8139c3bda07a4a0e50cea0f20d8d6c168
The Android Automerger [Wed, 25 Sep 2013 13:03:59 +0000 (06:03 -0700)]
"KRS87"
The Android Automerger [Wed, 25 Sep 2013 13:00:53 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
Eino-Ville Talvala [Wed, 25 Sep 2013 01:09:20 +0000 (01:09 +0000)]
Merge "Add android-ex-camera2 static java library to PDK." into klp-dev
The Android Automerger [Wed, 25 Sep 2013 00:03:52 +0000 (17:03 -0700)]
"KRS86F"
Eino-Ville Talvala [Tue, 24 Sep 2013 23:57:28 +0000 (16:57 -0700)]
Add android-ex-camera2 static java library to PDK.
Library is located frameworks/ex/camera2/public.
This is required to allow pdk/apps/CameraITS to build in the PDK.
Bug:
10337323
Change-Id: I5b835134012f90462a70b9e38b69c3168df00cfd
The Android Automerger [Tue, 24 Sep 2013 22:21:03 +0000 (15:21 -0700)]
"KRS86E"
The Android Automerger [Tue, 24 Sep 2013 21:39:12 +0000 (14:39 -0700)]
"KRS86D"
Dan Willemsen [Tue, 24 Sep 2013 04:15:23 +0000 (21:15 -0700)]
Don't check vendor path for phony packages
These don't get installed, so they don't need to be in TARGET_OUT_VENDOR
Change-Id: I887ca4758e7c477808ed9a6b621dfd3f4ede5f32
The Android Automerger [Tue, 24 Sep 2013 16:45:34 +0000 (09:45 -0700)]
KRS86C
The Android Automerger [Tue, 24 Sep 2013 16:17:16 +0000 (09:17 -0700)]
KRS86B
The Android Automerger [Tue, 24 Sep 2013 13:03:31 +0000 (06:03 -0700)]
"KRS86"
The Android Automerger [Tue, 24 Sep 2013 13:00:33 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
The Android Automerger [Mon, 23 Sep 2013 23:18:13 +0000 (16:18 -0700)]
"KRS85C"
Baligh Uddin [Mon, 23 Sep 2013 22:54:41 +0000 (15:54 -0700)]
am
fe66c390: bump version to 4.3.1
* commit '
fe66c390fb4068b380068a99311fdc42ae56dfa6':
bump version to 4.3.1
The Android Automerger [Mon, 23 Sep 2013 22:43:15 +0000 (15:43 -0700)]
"KQS81D"
Baligh Uddin [Mon, 23 Sep 2013 22:05:45 +0000 (15:05 -0700)]
bump version to 4.3.1
OSDN Git Service
