OSDN Git Service
Ed Heyl [Fri, 9 May 2014 05:58:27 +0000 (05:58 +0000)]
Merge "Fix build: Revert "Add verity support to `make dist`.""
Ed Heyl [Fri, 9 May 2014 05:53:54 +0000 (05:53 +0000)]
Fix build: Revert "Add verity support to `make dist`."
This reverts commit
5dee206d8ef106a70a5ada4b8aba9c4489f7e308.
Change-Id: I6f4f536c127d3e5dcb6594efb193231cd8dece7e
Xavier Ducrohet [Fri, 9 May 2014 02:13:32 +0000 (02:13 +0000)]
am
a6a2969e: Resolved conflicts for merge of
05a7a955 to klp-modular-dev-plus-aosp
* commit '
a6a2969e020ea16edbe24661d2b63f7f2bdf98b6':
Remove SDK Tools from platform builds.
Xavier Ducrohet [Fri, 9 May 2014 01:41:34 +0000 (18:41 -0700)]
Resolved conflicts for merge of
05a7a955 to klp-modular-dev-plus-aosp
Change-Id: Ife0d1ef3d5a0cb4b91c8b813d259c947c85018f8
Geremy Condra [Fri, 9 May 2014 01:39:44 +0000 (01:39 +0000)]
Merge "Add verity support to `make dist`."
Xavier Ducrohet [Fri, 9 May 2014 00:52:34 +0000 (00:52 +0000)]
am
afe444a5: Merge "Remove SDK Tools from platform builds."
* commit '
afe444a564ed72cdda792822a0c9dab57a8c9172':
Remove SDK Tools from platform builds.
Xavier Ducrohet [Fri, 9 May 2014 00:46:44 +0000 (00:46 +0000)]
Merge "Remove SDK Tools from platform builds."
Ying Wang [Fri, 9 May 2014 00:15:43 +0000 (00:15 +0000)]
am
af3f1a54: am
d6214b31: am
0d4b3df6: Merge "Target "tests" now only builds the modules tagged as "tests""
* commit '
af3f1a54545dadc4606b74e16416712fbd3efecf':
Target "tests" now only builds the modules tagged as "tests"
Ying Wang [Fri, 9 May 2014 00:15:42 +0000 (00:15 +0000)]
am
1ba08f6b: (-s ours) am
2d41656c: am
f6603f75: Merge "Add tool to package up built modules."
* commit '
1ba08f6b7c79a75eb43017babdc760642ad39b6a':
Add tool to package up built modules.
Ying Wang [Fri, 9 May 2014 00:10:43 +0000 (00:10 +0000)]
am
d6214b31: am
0d4b3df6: Merge "Target "tests" now only builds the modules tagged as "tests""
* commit '
d6214b3161161faf63a60b3ad3f595569a481192':
Target "tests" now only builds the modules tagged as "tests"
Ying Wang [Fri, 9 May 2014 00:10:43 +0000 (00:10 +0000)]
am
2d41656c: am
f6603f75: Merge "Add tool to package up built modules."
* commit '
2d41656cdb41853e42a7ea2c0597ce505ef51750':
Add tool to package up built modules.
Ying Wang [Fri, 9 May 2014 00:06:36 +0000 (00:06 +0000)]
am
0d4b3df6: Merge "Target "tests" now only builds the modules tagged as "tests""
* commit '
0d4b3df6aa495ab2aaabe3a8d5c9c6ad69ab5667':
Target "tests" now only builds the modules tagged as "tests"
Ying Wang [Fri, 9 May 2014 00:06:35 +0000 (00:06 +0000)]
am
f6603f75: Merge "Add tool to package up built modules."
* commit '
f6603f753d492823e19d0677d5a9ccfc16f51805':
Add tool to package up built modules.
Ying Wang [Fri, 9 May 2014 00:03:03 +0000 (00:03 +0000)]
Merge "Target "tests" now only builds the modules tagged as "tests""
Ying Wang [Fri, 9 May 2014 00:02:50 +0000 (00:02 +0000)]
Merge "Add tool to package up built modules."
Ying Wang [Wed, 7 May 2014 23:39:21 +0000 (16:39 -0700)]
Target "tests" now only builds the modules tagged as "tests"
But not install them.
This prevents "make tests" polluting system.img or userdata.img.
We have new mechanism to build and package up modules into zip file in
build/core/tasks/tools.
Change package-modules.mk to install DATA/ instead of data/ in the
zip file; Better handle of module name conflicting.
Bug:
13585955
Change-Id: I7586a8c7995b984c9ead0ba2fa84dd5d2dd20bd1
Ying Wang [Mon, 5 May 2014 23:46:52 +0000 (16:46 -0700)]
Add tool to package up built modules.
With this change, you can package up modules while avoiding installing
them to the system.img or userdata.img.
- build/core/tasks/tools/package-modules.mk
You can use this template to package up modules into a zip file and
preserve the installed file paths.
- LOCAL_PICKUP_FILES, you can use this variable to package up extra
files/directories.
Bug:
13585955
Change-Id: I103042b24ccf17cf5dc90c016d97ed1dd293e50b
Ying Wang [Thu, 8 May 2014 23:43:31 +0000 (23:43 +0000)]
Merge "Target "tests" now only builds the modules tagged as "tests""
Tsu Chiang Chuang [Thu, 8 May 2014 23:12:40 +0000 (23:12 +0000)]
am
c0d50f62: am
5bd1da1e: am
41d8760d: Merge "Bump userdata image size from 200 MB to 550 MB"
* commit '
c0d50f6295e9c552456c825f9c8045dced05a409':
Bump userdata image size from 200 MB to 550 MB
Tsu Chiang Chuang [Thu, 8 May 2014 23:01:48 +0000 (23:01 +0000)]
am
5bd1da1e: am
41d8760d: Merge "Bump userdata image size from 200 MB to 550 MB"
* commit '
5bd1da1e0e9dff444f98fb1b2e2954663041198f':
Bump userdata image size from 200 MB to 550 MB
Tsu Chiang Chuang [Thu, 8 May 2014 22:50:27 +0000 (22:50 +0000)]
am
41d8760d: Merge "Bump userdata image size from 200 MB to 550 MB"
* commit '
41d8760d683f21d2868fbfb6872a3cf65b9edbcb':
Bump userdata image size from 200 MB to 550 MB
Tsu Chiang Chuang [Thu, 8 May 2014 22:39:00 +0000 (22:39 +0000)]
Merge "Bump userdata image size from 200 MB to 550 MB"
Brian Carlstrom [Thu, 8 May 2014 22:00:37 +0000 (22:00 +0000)]
am
676c8f04: am
4ed19f0f: am
1e63c2d1: Merge "Add dalvik.vm.dex2oat-flags for eng build"
* commit '
676c8f0450a9dfb84c12257195ba05619aeed970':
Add dalvik.vm.dex2oat-flags for eng build
Brian Carlstrom [Thu, 8 May 2014 21:57:32 +0000 (21:57 +0000)]
am
4ed19f0f: am
1e63c2d1: Merge "Add dalvik.vm.dex2oat-flags for eng build"
* commit '
4ed19f0f4294544d0447025f0079a9d9e185a495':
Add dalvik.vm.dex2oat-flags for eng build
Brian Carlstrom [Thu, 8 May 2014 21:53:14 +0000 (21:53 +0000)]
am
1e63c2d1: Merge "Add dalvik.vm.dex2oat-flags for eng build"
* commit '
1e63c2d15cba608a154bbd563f96dde334691147':
Add dalvik.vm.dex2oat-flags for eng build
Ying Wang [Wed, 7 May 2014 23:39:21 +0000 (16:39 -0700)]
Target "tests" now only builds the modules tagged as "tests"
But not install them.
This prevents "make tests" polluting system.img or userdata.img.
We have new mechanism to build and package up modules into zip file in
build/core/tasks/tools.
Change package-modules.mk to install DATA/ instead of data/ in the
zip file; Better handle of module name conflicting.
Bug:
13585955
Change-Id: I7586a8c7995b984c9ead0ba2fa84dd5d2dd20bd1
Xavier Ducrohet [Tue, 1 Apr 2014 19:13:58 +0000 (12:13 -0700)]
Remove SDK Tools from platform builds.
(cherry picked from commit
edf30221b4890673dc714a1efef3b5faf4ae1522)
Change-Id: Ia74c2ece1528adca10a4eec24e73b4ce361af1a9
Brian Carlstrom [Thu, 8 May 2014 21:49:31 +0000 (21:49 +0000)]
Merge "Add dalvik.vm.dex2oat-flags for eng build"
Ying Wang [Thu, 8 May 2014 18:31:14 +0000 (18:31 +0000)]
am
af93afce: am
0a61a603: am
3b15cdb8: Merge "Apply LOCAL_LDLIBS to target build rules too."
* commit '
af93afcec91d31d1f5afb88b83413cdc7c019e70':
Apply LOCAL_LDLIBS to target build rules too.
Narayan Kamath [Tue, 6 May 2014 14:14:09 +0000 (15:14 +0100)]
Remove hardcoded TARGET_PREFER_32_BIT_APPS.
This isn't required any longer, besides individual products
should be allowed to set this value themselves.
Change-Id: I684edf073b5c19f412b4617f8aa22824193c19be
Ying Wang [Thu, 8 May 2014 00:27:03 +0000 (00:27 +0000)]
am
0a61a603: am
3b15cdb8: Merge "Apply LOCAL_LDLIBS to target build rules too."
* commit '
0a61a6032ccfe5b26395da1a0a9512957797fa69':
Apply LOCAL_LDLIBS to target build rules too.
Ying Wang [Thu, 8 May 2014 00:21:35 +0000 (00:21 +0000)]
am
3b15cdb8: Merge "Apply LOCAL_LDLIBS to target build rules too."
* commit '
3b15cdb854dfe79507cace8ce54828861bbe7a8c':
Apply LOCAL_LDLIBS to target build rules too.
Ying Wang [Thu, 8 May 2014 00:15:30 +0000 (00:15 +0000)]
Merge "Apply LOCAL_LDLIBS to target build rules too."
Ying Wang [Wed, 7 May 2014 18:33:19 +0000 (11:33 -0700)]
Apply LOCAL_LDLIBS to target build rules too.
Use LOCAL_LDLIBS to link against prebuilt libraries (such as NDK
libraries).
Previously LOCAL_LDLIBS only applies to host modules and the behaviour
confuses users.
Change-Id: I515546d7b59ef54e8ef09050eb58ec63534c9291
Brian Carlstrom [Tue, 11 Feb 2014 01:52:53 +0000 (17:52 -0800)]
Add dalvik.vm.dex2oat-flags for eng build
Bug:
12869646
Change-Id: I794320267c846225931f12075c7f32d7848081e9
Geremy Condra [Tue, 6 May 2014 05:19:37 +0000 (22:19 -0700)]
Add verity support to `make dist`.
Without this, system images will be built that do not contain the
necessary bits for verification.
Change-Id: Icaa636085dbfd386424c90dfbe404c5960df0fe4
Tsu Chiang Chuang [Wed, 7 May 2014 00:27:20 +0000 (17:27 -0700)]
Bump userdata image size from 200 MB to 550 MB
Change-Id: Ibdf319091a7187dc894f4a923d40868cec4b7b41
Ying Wang [Wed, 7 May 2014 00:28:55 +0000 (00:28 +0000)]
Merge "Add tool to package up built modules."
Ying Wang [Tue, 6 May 2014 22:15:54 +0000 (22:15 +0000)]
Merge "Automatically export generated .pb.h files."
Ying Wang [Tue, 6 May 2014 20:03:32 +0000 (13:03 -0700)]
Automatically export generated .pb.h files.
- Automatically export the include path of the generated .pb.h files
- Set up the dependency to make sure the .pb.h files get generated
before any dependent c/c++ files get compiled.
With this change, any module that links a proto library doesn't need
any extra setup.
Bug:
14563418
Change-Id: Iea7d19e9d8dce8e7d479c386b7a6151a95a0a0df
Ying Wang [Tue, 6 May 2014 19:21:35 +0000 (19:21 +0000)]
am
ccd6223f: am
ba0bb801: am
a16583a0: Merge "Fix windows/mingw build."
* commit '
ccd6223f5658dbc627cfe4827d3d6571107ef616':
Fix windows/mingw build.
Ying Wang [Tue, 6 May 2014 19:19:15 +0000 (19:19 +0000)]
am
ba0bb801: am
a16583a0: Merge "Fix windows/mingw build."
* commit '
ba0bb801c3cfee582e454432e6a0a75491e54236':
Fix windows/mingw build.
Ying Wang [Tue, 6 May 2014 19:16:12 +0000 (19:16 +0000)]
am
a16583a0: Merge "Fix windows/mingw build."
* commit '
a16583a0880f574937f08bf2c86be72b0f4b9274':
Fix windows/mingw build.
Ying Wang [Tue, 6 May 2014 19:13:21 +0000 (19:13 +0000)]
Merge "Fix windows/mingw build."
Ying Wang [Tue, 6 May 2014 19:10:55 +0000 (12:10 -0700)]
Fix windows/mingw build.
Bug:
14446414
Change-Id: I9d12ed8afb6d4d5a09ef9b2844eb193b52b74271
Ying Wang [Tue, 6 May 2014 18:52:06 +0000 (18:52 +0000)]
am
bf4cdb49: am
c3b2314a: am
a37550ed: Merge "Use prebuilt flex."
* commit '
bf4cdb49a3e56b37f8bd2eeeeeb4a72795dcd0a9':
Use prebuilt flex.
Ying Wang [Tue, 6 May 2014 18:46:10 +0000 (18:46 +0000)]
am
c3b2314a: am
a37550ed: Merge "Use prebuilt flex."
* commit '
c3b2314a58e8d6f90766db2ef82303bafcefb766':
Use prebuilt flex.
Ying Wang [Tue, 6 May 2014 18:43:28 +0000 (18:43 +0000)]
am
a37550ed: Merge "Use prebuilt flex."
* commit '
a37550edd39b3520839251b2a4acceca779a8a8b':
Use prebuilt flex.
Ying Wang [Tue, 6 May 2014 18:40:59 +0000 (18:40 +0000)]
Merge "Use prebuilt flex."
Ying Wang [Tue, 6 May 2014 16:28:00 +0000 (16:28 +0000)]
am
9c7393b8: am
e9dd544d: am
889a93a4: Merge "add silvermont x86 architecture"
* commit '
9c7393b87aed5ae6acd97529b05ce26f80627259':
add silvermont x86 architecture
Ying Wang [Tue, 6 May 2014 16:24:30 +0000 (16:24 +0000)]
am
e9dd544d: am
889a93a4: Merge "add silvermont x86 architecture"
* commit '
e9dd544dfed3a974d2bb2e6f783238ecfe64fb6c':
add silvermont x86 architecture
Ying Wang [Tue, 6 May 2014 16:20:51 +0000 (16:20 +0000)]
am
889a93a4: Merge "add silvermont x86 architecture"
* commit '
889a93a49582fa17049f0424af3c1c06f70db407':
add silvermont x86 architecture
Ying Wang [Tue, 6 May 2014 16:18:56 +0000 (16:18 +0000)]
Merge "add silvermont x86 architecture"
Ying Wang [Tue, 6 May 2014 02:09:46 +0000 (02:09 +0000)]
am
876dca69: am
2c32044d: am
b7e0bdc0: Merge "Increase system image size of generic_x86_64 to 750MB."
* commit '
876dca695d1be00054fe7c4b5ac4e7c36b6c1eb9':
Increase system image size of generic_x86_64 to 750MB.
Ying Wang [Tue, 6 May 2014 02:05:46 +0000 (02:05 +0000)]
am
2c32044d: am
b7e0bdc0: Merge "Increase system image size of generic_x86_64 to 750MB."
* commit '
2c32044d95501b376cd8f912b28c957accfb1873':
Increase system image size of generic_x86_64 to 750MB.
Ying Wang [Tue, 6 May 2014 02:03:55 +0000 (02:03 +0000)]
am
b7e0bdc0: Merge "Increase system image size of generic_x86_64 to 750MB."
* commit '
b7e0bdc02be3c505c72d431c1addd42016d0a7fc':
Increase system image size of generic_x86_64 to 750MB.
Ying Wang [Tue, 6 May 2014 02:01:58 +0000 (02:01 +0000)]
Merge "Increase system image size of generic_x86_64 to 750MB."
Ying Wang [Tue, 6 May 2014 02:01:28 +0000 (19:01 -0700)]
Increase system image size of generic_x86_64 to 750MB.
Change-Id: I0c3264c7f629bc4d8c30539590de00967188807b
Ying Wang [Tue, 6 May 2014 01:34:57 +0000 (18:34 -0700)]
Use prebuilt flex.
Bug:
14446414
Change-Id: I07fe8d7f246de853e5bae17286834268e36d260c
Ying Wang [Mon, 5 May 2014 23:46:52 +0000 (16:46 -0700)]
Add tool to package up built modules.
With this change, you can package up modules while avoiding installing
them to the system.img or userdata.img.
- build/core/tasks/tools/package-modules.mk
You can use this template to package up modules into a zip file and
preserve the installed file paths.
- LOCAL_PICKUP_FILES, you can use this variable to package up extra
files/directories.
Bug:
13585955
Change-Id: I103042b24ccf17cf5dc90c016d97ed1dd293e50b
Colin Cross [Mon, 5 May 2014 23:37:07 +0000 (23:37 +0000)]
am
40aabbee: am
9150a90d: am
5128237a: Merge "build: set TARGET_SUPPORTS_64_BIT_APPS in 64-bit config"
* commit '
40aabbeeac53a01d42316423c7091612a1302b3f':
build: set TARGET_SUPPORTS_64_BIT_APPS in 64-bit config
Colin Cross [Mon, 5 May 2014 23:09:04 +0000 (23:09 +0000)]
am
9150a90d: am
5128237a: Merge "build: set TARGET_SUPPORTS_64_BIT_APPS in 64-bit config"
* commit '
9150a90dafd6554519d41e5efffeb501268cf8de':
build: set TARGET_SUPPORTS_64_BIT_APPS in 64-bit config
Colin Cross [Mon, 5 May 2014 23:05:14 +0000 (23:05 +0000)]
am
5128237a: Merge "build: set TARGET_SUPPORTS_64_BIT_APPS in 64-bit config"
* commit '
5128237ad3312523c5a1390efce33ad77f0f2ff0':
build: set TARGET_SUPPORTS_64_BIT_APPS in 64-bit config
Colin Cross [Mon, 5 May 2014 23:02:45 +0000 (23:02 +0000)]
Merge "build: set TARGET_SUPPORTS_64_BIT_APPS in 64-bit config"
Colin Cross [Mon, 5 May 2014 22:25:41 +0000 (15:25 -0700)]
build: set TARGET_SUPPORTS_64_BIT_APPS in 64-bit config
Set TARGET_SUPPORTS_32_BIT_APPS and TARGET_SUPPORTS_64_BIT_APPS,
TARGET_PREFERS_32_BIT_APPS is enough to get apps to build for
32-bit only, and leaving TARGET_SUPPORTS_64_BIT_APPS unset
confuses zygote64 because it finds an empty 64-bit ABI list.
Change-Id: Iadea7f2b42c216710b54aeac6011a4e30e0f2eaa
Marco Nelissen [Mon, 5 May 2014 21:28:25 +0000 (21:28 +0000)]
Merge "Add libmediandk"
Colin Cross [Mon, 5 May 2014 20:22:36 +0000 (20:22 +0000)]
am
6f916664: am
735628e8: am
2ff8919d: Merge changes I7e809264,I504cea21,Ibd2165e6
* commit '
6f9166640a62f694a257a307284ea1c442f66a7b':
build: add core_64_bit.mk
build: reverse abi list when TARGET_PREFER_32_BIT_APPS is set
build: split TARGET_PREFER_32_BIT for apps and executables
Colin Cross [Mon, 5 May 2014 20:18:09 +0000 (20:18 +0000)]
am
735628e8: am
2ff8919d: Merge changes I7e809264,I504cea21,Ibd2165e6
* commit '
735628e8d19fae51574bd5057c142db56797a2b0':
build: add core_64_bit.mk
build: reverse abi list when TARGET_PREFER_32_BIT_APPS is set
build: split TARGET_PREFER_32_BIT for apps and executables
Colin Cross [Mon, 5 May 2014 20:14:18 +0000 (20:14 +0000)]
am
2ff8919d: Merge changes I7e809264,I504cea21,Ibd2165e6
* commit '
2ff8919de339209412d9da2a524f566dfcf5847f':
build: add core_64_bit.mk
build: reverse abi list when TARGET_PREFER_32_BIT_APPS is set
build: split TARGET_PREFER_32_BIT for apps and executables
Colin Cross [Mon, 5 May 2014 20:11:28 +0000 (20:11 +0000)]
Merge changes I7e809264,I504cea21,Ibd2165e6
* changes:
build: add core_64_bit.mk
build: reverse abi list when TARGET_PREFER_32_BIT_APPS is set
build: split TARGET_PREFER_32_BIT for apps and executables
Michael Runge [Mon, 5 May 2014 19:57:56 +0000 (19:57 +0000)]
Merge "Support block OTA + OEM partition"
Michael Runge [Mon, 5 May 2014 18:55:47 +0000 (11:55 -0700)]
Support block OTA + OEM partition
Change-Id: I9e662098569a43b05279908e6833e9552a7abe3a
David 'Digit' Turner [Mon, 5 May 2014 19:09:09 +0000 (19:09 +0000)]
Merge "envsetup.sh: Use prebuilt emulator binaries if available."
Ying Wang [Mon, 5 May 2014 18:50:19 +0000 (18:50 +0000)]
am
0049c40e: am
54a570bd: am
57df0c7b: Merge "Increase system image size of generic_x86_64 to 650MB."
* commit '
0049c40efd053d0fae186515e7cfc3fc0671c4cd':
Increase system image size of generic_x86_64 to 650MB.
Ying Wang [Mon, 5 May 2014 18:45:57 +0000 (18:45 +0000)]
am
54a570bd: am
57df0c7b: Merge "Increase system image size of generic_x86_64 to 650MB."
* commit '
54a570bd1da36041124965110f4d2d1206558c82':
Increase system image size of generic_x86_64 to 650MB.
Ying Wang [Mon, 5 May 2014 18:41:32 +0000 (18:41 +0000)]
am
57df0c7b: Merge "Increase system image size of generic_x86_64 to 650MB."
* commit '
57df0c7bf5a78b1c4edb7e06d22ccc91ad46b41d':
Increase system image size of generic_x86_64 to 650MB.
Ying Wang [Mon, 5 May 2014 18:37:29 +0000 (18:37 +0000)]
Merge "Increase system image size of generic_x86_64 to 650MB."
Ying Wang [Mon, 5 May 2014 18:33:06 +0000 (11:33 -0700)]
Increase system image size of generic_x86_64 to 650MB.
Change-Id: Iacf6dcd00d78039d1b19595db6f293f8f202ac5a
Justin Koh [Mon, 5 May 2014 17:50:37 +0000 (17:50 +0000)]
am
007f8c80: am
0e35df2a: Add ContactsProvider to core_tiny.
* commit '
007f8c804fbabfea461db546eb46ac9b1d3e9e3d':
Add ContactsProvider to core_tiny.
Justin Koh [Mon, 5 May 2014 17:46:55 +0000 (17:46 +0000)]
am
0e35df2a: Add ContactsProvider to core_tiny.
* commit '
0e35df2a7c77a6308106fa9a48f90c4729b9b8f3':
Add ContactsProvider to core_tiny.
David 'Digit' Turner [Mon, 5 May 2014 14:13:50 +0000 (16:13 +0200)]
envsetup.sh: Use prebuilt emulator binaries if available.
This patch changes the setpaths() function in envsetup.sh to probe
for prebuilts/android-emulator/<host>/, and prepend it to PATH if
it exists.
See https://googleplex-android-review.googlesource.com/#/c/459741/
for a related patch that adds the binaries.
BUG=
13747402
Change-Id: I30794ea52f6dfc58908e6271f2c0da8e2f0b68e8
Justin Koh [Sun, 4 May 2014 23:31:02 +0000 (16:31 -0700)]
Add ContactsProvider to core_tiny.
Add ContactsProvider to core_tiny: this is necessary to pass CTS.
Change-Id: I159109740f329e5c540ffb6f1cd1b1a7f9429d86
Colin Cross [Fri, 2 May 2014 23:52:16 +0000 (23:52 +0000)]
Merge "verity: switch to C++ version of build_verity_tree"
Dirk Dougherty [Fri, 2 May 2014 23:03:45 +0000 (23:03 +0000)]
am
d19aa4ba: am
611d7e14: am
379d9968: am
e21bed28: Merge changes from templates-sdk to templates-sdk-dyn.
* commit '
d19aa4bae2161f89966e38cb099f2f080e2bbfac':
Merge changes from templates-sdk to templates-sdk-dyn.
Dirk Dougherty [Fri, 2 May 2014 22:58:02 +0000 (22:58 +0000)]
am
611d7e14: am
379d9968: am
e21bed28: Merge changes from templates-sdk to templates-sdk-dyn.
* commit '
611d7e14e87d030cd5d89b932a1877289ab68e8d':
Merge changes from templates-sdk to templates-sdk-dyn.
Dirk Dougherty [Fri, 2 May 2014 22:54:45 +0000 (22:54 +0000)]
am
379d9968: am
e21bed28: Merge changes from templates-sdk to templates-sdk-dyn.
* commit '
379d9968ccc31701053eca7e0d809f2f52c0b964':
Merge changes from templates-sdk to templates-sdk-dyn.
Dirk Dougherty [Fri, 2 May 2014 22:50:25 +0000 (22:50 +0000)]
am
e21bed28: Merge changes from templates-sdk to templates-sdk-dyn.
* commit '
e21bed28acdd21f6000d1de30538839085ffa890':
Merge changes from templates-sdk to templates-sdk-dyn.
Dirk Dougherty [Fri, 2 May 2014 22:14:04 +0000 (15:14 -0700)]
Merge changes from templates-sdk to templates-sdk-dyn.
Change-Id: I42e42f8d412eae6fc1160594c235cda81b2baf4f
Chad Jones [Mon, 28 Apr 2014 17:58:35 +0000 (10:58 -0700)]
Expand PDK platform.zip auto-detect to named with vendor/pdk/PRODUCT
Change-Id: Ib813c9333541fa041a0902dab113fb7dc01f7e45
Tim Murray [Fri, 2 May 2014 18:30:12 +0000 (18:30 +0000)]
am
09e044ea: am
6ac74e6d: am
d720c5a2: Merge "Add -no-integrated-as for ARM64."
* commit '
09e044ea813cc23b1d3b5ed99b20dea9ec7c5328':
Add -no-integrated-as for ARM64.
Tim Murray [Fri, 2 May 2014 18:26:14 +0000 (18:26 +0000)]
am
6ac74e6d: am
d720c5a2: Merge "Add -no-integrated-as for ARM64."
* commit '
6ac74e6d81744654b6ca36b5df369975a1fcc655':
Add -no-integrated-as for ARM64.
Tim Murray [Fri, 2 May 2014 18:24:20 +0000 (18:24 +0000)]
am
d720c5a2: Merge "Add -no-integrated-as for ARM64."
* commit '
d720c5a2a6cb44e76c20f96d33b0ac8a96060d91':
Add -no-integrated-as for ARM64.
Tim Murray [Fri, 2 May 2014 18:21:34 +0000 (18:21 +0000)]
Merge "Add -no-integrated-as for ARM64."
Ying Wang [Fri, 2 May 2014 04:05:59 +0000 (04:05 +0000)]
am
372df5a4: am
887a52d0: am
a6b8025a: Merge "Add WITH_DEXPREOPT to the list of protected global variables."
* commit '
372df5a49ebae4ce04df4633be195afb224c5d86':
Add WITH_DEXPREOPT to the list of protected global variables.
Ying Wang [Fri, 2 May 2014 04:03:18 +0000 (04:03 +0000)]
am
887a52d0: am
a6b8025a: Merge "Add WITH_DEXPREOPT to the list of protected global variables."
* commit '
887a52d02251a1a94f8e17ecbfe26ba15ece6af5':
Add WITH_DEXPREOPT to the list of protected global variables.
Ying Wang [Fri, 2 May 2014 04:00:30 +0000 (04:00 +0000)]
am
a6b8025a: Merge "Add WITH_DEXPREOPT to the list of protected global variables."
* commit '
a6b8025a815cc5c9b441a91917f100486c270446':
Add WITH_DEXPREOPT to the list of protected global variables.
Ying Wang [Fri, 2 May 2014 03:57:32 +0000 (03:57 +0000)]
Merge "Add WITH_DEXPREOPT to the list of protected global variables."
Ying Wang [Fri, 2 May 2014 03:55:30 +0000 (20:55 -0700)]
Add WITH_DEXPREOPT to the list of protected global variables.
Bug:
14380196
Change-Id: I02cff39eeaf2deddf434c0c310063e4b341edd43
Michael Runge [Wed, 16 Apr 2014 00:40:21 +0000 (17:40 -0700)]
Add support for verifying OEM properties.
A separate OEM file must be specified to provide the expected
values for these properties. The list of properties comes from
the "oem_fingerprint_properties" list in misc_info.txt
Bug: b/
13367676
Change-Id: I1a3eaf108492132cf6f595a5d1c9f7e0c3cb3142
Colin Cross [Thu, 1 May 2014 00:42:03 +0000 (17:42 -0700)]
build: add core_64_bit.mk
Add a new product, core_64_bit.mk, that products can inherit from
to configure zygote and the rest of the build system for a standard
64-bit product.
Make the 64-bit emulator targets for arm64, mips64, and x86_64
inherit from it.
Change-Id: I7e809264db39472f554cd5290529f3d6499345d4
OSDN Git Service
