Ying Wang
1a48f92daa
am 164a9639: am 9e8b6c42: am 3d48d9c3: Allow to run checkbuild in sdk build.
...
* commit '164a963962b7b2816bb92016c6ce0ff52ac93c43':
Allow to run checkbuild in sdk build.
2013-10-02 11:14:56 -07:00
Ying Wang
164a963962
am 9e8b6c42: am 3d48d9c3: Allow to run checkbuild in sdk build.
...
* commit '9e8b6c429d9d17d8251ae8aa15c6de2420732431':
Allow to run checkbuild in sdk build.
2013-10-02 11:13:13 -07:00
Ying Wang
9e8b6c429d
am 3d48d9c3: Allow to run checkbuild in sdk build.
...
* commit '3d48d9c36b2d2cd696d3ee2656939e77ca5ba950':
Allow to run checkbuild in sdk build.
2013-10-02 11:11:13 -07:00
Ying Wang
3d48d9c36b
Allow to run checkbuild in sdk build.
...
Bug: 9594464
Change-Id: Ia02e7d8fc157cdfe2e065ce9e42a3800457f89f6
(cherry picked from commit fcec57a116
2013-10-02 18:09:10 +00:00
The Android Automerger
b03f2c9ba6
"KRT02"
2013-10-02 06:02:34 -07:00
The Android Automerger
ffd182d31c
merge in klp-release history after reset to klp-dev
2013-10-02 06:00:41 -07:00
Ying Wang
d74b538d9a
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
2013-10-01 18:16:45 -07:00
The Android Automerger
403fb03cd3
"KRT01B"
2013-10-01 15:39:38 -07:00
The Android Automerger
6a76145eb8
"KRT01"
2013-10-01 09:25:25 -07:00
The Android Automerger
5706663357
merge in klp-release history after reset to klp-dev
2013-10-01 09:25:06 -07:00
The Android Automerger
3a2a84cc1b
"KRT81"
2013-10-01 07:47:29 -07:00
The Android Automerger
4f4987e853
merge in klp-release history after reset to klp-dev
2013-10-01 07:47:14 -07:00
The Android Automerger
f3bc464a8f
"KRT01"
2013-10-01 06:02:39 -07:00
The Android Automerger
64207860d7
merge in klp-release history after reset to klp-dev
2013-10-01 06:00:23 -07:00
The Android Automerger
9fb93d4053
"KQS81I"
2013-09-30 21:00:24 -07:00
Ben Gilad
d7992e9587
Replace a dangling refeence to packages/apps/Phone.
...
Change-Id: I47b68510d19ccbaa2fc125c2a422fd1e857ec18e
2013-09-30 16:54:17 -07:00
The Android Automerger
5da4a2cced
"KRS92B"
2013-09-30 16:37:26 -07:00
The Android Automerger
341e4fc455
"KRS92"
2013-09-30 06:01:11 -07:00
The Android Automerger
56c510d5d9
merge in klp-release history after reset to klp-dev
2013-09-30 06:00:07 -07:00
The Android Automerger
79385eb94f
KRS91B
2013-09-29 15:11:18 -07:00
The Android Automerger
1ba9c53deb
"KFS78N"
2013-09-29 14:43:12 -07:00
The Android Automerger
125b9e8b96
"KQS81H"
2013-09-29 13:33:42 -07:00
The Android Automerger
9986ed526e
"KRS91"
2013-09-29 06:03:21 -07:00
The Android Automerger
861e7171f1
merge in klp-release history after reset to klp-dev
2013-09-29 06:00:40 -07:00
The Android Automerger
640f6939e6
KFS78M
2013-09-28 19:40:24 -07:00
The Android Automerger
96ca34d471
"KRS88G"
2013-09-27 15:47:55 -07:00
The Android Automerger
3d331a158e
"KRS88F"
2013-09-27 15:22:49 -07:00
The Android Automerger
531f495367
"KRS88E"
2013-09-27 11:31:20 -07:00
The Android Automerger
59ed0be381
"KRS88D"
2013-09-26 17:14:01 -07:00
The Android Automerger
d891134a31
"KRS88C"
2013-09-26 16:37:46 -07:00
The Android Automerger
759b4e5725
"KRS88B"
2013-09-26 15:04:24 -07:00
The Android Automerger
b323a7f221
"KRS88"
2013-09-26 06:03:45 -07:00
The Android Automerger
161e57e944
merge in klp-release history after reset to klp-dev
2013-09-26 06:00:47 -07:00
The Android Automerger
05c33ca508
KQS81G
2013-09-25 22:14:47 -07:00
The Android Automerger
9acf00a4d7
KQS81F
2013-09-25 21:34:22 -07:00
Justin Ho
d1601029b4
Remove Email from HH FactoryROM
...
Bug: 10806060
Change-Id: I037f2886fbcdc6f444140b4ded3594a41ecefd1e
2013-09-25 18:17:10 -07:00
The Android Automerger
51a5566b91
"KRS87B"
2013-09-25 15:03:30 -07:00
The Android Automerger
5f140149e4
KQS81E
2013-09-25 13:08:12 -07:00
Ying Wang
392d042c21
am b6da30c3: am 2408479c: Allow module to specify LOCAL_INSTALLED_MODULE_STEM
...
* commit 'b6da30c3724cc2a452be2c1ae425eff4f7d55944':
Allow module to specify LOCAL_INSTALLED_MODULE_STEM
2013-09-25 12:37:19 -07:00
Baligh Uddin
0ae6f769fa
am 55dc7844: am d21a641f: (-s ours) am fe66c390: bump version to 4.3.1
...
* commit '55dc78446e4a3f8048d28bb78a7b9f2b988494bf':
bump version to 4.3.1
2013-09-25 12:37:18 -07:00
Ying Wang
b6da30c372
am 2408479c: Allow module to specify LOCAL_INSTALLED_MODULE_STEM
...
* commit '2408479cf9cf9cfe87e464e9b5d2f36143818d37':
Allow module to specify LOCAL_INSTALLED_MODULE_STEM
2013-09-25 12:35:04 -07:00
Baligh Uddin
55dc78446e
am d21a641f: (-s ours) am fe66c390: bump version to 4.3.1
...
* commit 'd21a641fb4c27fdba21b72116a4e5e722a7acf6f':
bump version to 4.3.1
2013-09-25 12:35:04 -07:00
Ying Wang
2408479cf9
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
2013-09-25 12:30:59 -07:00
The Android Automerger
f0d892cd69
"KRS87"
2013-09-25 06:03:59 -07:00
The Android Automerger
94ede3fb97
merge in klp-release history after reset to klp-dev
2013-09-25 06:00:53 -07:00
Eino-Ville Talvala
ac079b1da4
Merge "Add android-ex-camera2 static java library to PDK." into klp-dev
2013-09-25 01:09:20 +00:00
The Android Automerger
eda4b337c5
"KRS86F"
2013-09-24 17:03:52 -07:00
Eino-Ville Talvala
735bba8be0
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
2013-09-24 16:57:28 -07:00
The Android Automerger
58f97df0d3
"KRS86E"
2013-09-24 15:21:03 -07:00
The Android Automerger
803fe4912e
"KRS86D"
2013-09-24 14:39:12 -07:00
