Jeff Davidson
0c949bd867
am 64606bd5: Merge "Update protobuf library from 2.3 to 2.6."
...
* commit '64606bd5b0b702b7f6d7fd1088486b5380ccc25f':
Update protobuf library from 2.3 to 2.6.
2015-01-15 23:01:59 +00:00
Jeff Davidson
64606bd5b0
Merge "Update protobuf library from 2.3 to 2.6."
2015-01-15 22:49:00 +00:00
Stephen Hines
d57b7c640d
am 5f31338c: Merge "Add ld.mc as a required executable to core_minimal.mk."
...
* commit '5f31338c1bbc0a958d390d7b21ecf5fc66d29ffd':
Add ld.mc as a required executable to core_minimal.mk.
2015-01-15 18:08:15 +00:00
Stephen Hines
5f31338c1b
Merge "Add ld.mc as a required executable to core_minimal.mk."
2015-01-15 17:54:55 +00:00
Stephen Hines
2306635fa3
Add ld.mc as a required executable to core_minimal.mk.
...
Bug: 18322681
Change-Id: I94754641db0c218e044f329bc59d4d918b389533
2015-01-14 16:11:12 -08:00
Andres Morales
121e53cace
am e1f21520: Merge "Add build.prop to root ramdisk"
...
* commit 'e1f2152015069b595f9f62f8b74e26baa5ebad9d':
Add build.prop to root ramdisk
2015-01-14 16:09:01 +00:00
Andres Morales
e1f2152015
Merge "Add build.prop to root ramdisk"
2015-01-14 15:56:20 +00:00
Andres Morales
9c820f82c4
Add build.prop to root ramdisk
...
will be used for verifying installed bootimage
Change-Id: Iaf80823545980fb2e464a558e918715cc1b82e11
2015-01-13 17:55:09 -08:00
Elliott Hughes
32ecc29996
am c56a6045: Merge "Remove HAVE_SYMLINKS."
...
* commit 'c56a60451188da6385ae9f52e0adbef14c647f21':
Remove HAVE_SYMLINKS.
2015-01-13 03:25:04 +00:00
Elliott Hughes
c56a604511
Merge "Remove HAVE_SYMLINKS."
2015-01-13 03:11:35 +00:00
Elliott Hughes
5877c21436
Remove HAVE_SYMLINKS.
...
Change-Id: I685357292af45a048439f0df0ae45f513479841a
2015-01-12 17:21:01 -08:00
Elliott Hughes
aa07929b29
am 1e61f12f: Merge "Remove HAVE_LIBC_SYSTEM_PROPERTIES and HAVE_SYSTEM_PROPERTY_SERVER."
...
* commit '1e61f12f1ecf42c91f71bcc7610a25d83ca738d9':
Remove HAVE_LIBC_SYSTEM_PROPERTIES and HAVE_SYSTEM_PROPERTY_SERVER.
2015-01-13 00:31:22 +00:00
Elliott Hughes
1e61f12f1e
Merge "Remove HAVE_LIBC_SYSTEM_PROPERTIES and HAVE_SYSTEM_PROPERTY_SERVER."
2015-01-13 00:19:59 +00:00
Elliott Hughes
a517f21c65
Remove HAVE_LIBC_SYSTEM_PROPERTIES and HAVE_SYSTEM_PROPERTY_SERVER.
...
In particular, no one has had the system property server since we
killed the sim-eng build...
Change-Id: If576ec546b0ba2ad3c5299876027ca9ac189cf4a
2015-01-12 13:48:27 -08:00
Elliott Hughes
446b9418a4
am 780c4320: Merge "Remove HAVE_POSIX_CLOCKS."
...
* commit '780c43208c9bdd1cacb18bf191b49d37a06cc19a':
Remove HAVE_POSIX_CLOCKS.
2015-01-12 19:00:55 +00:00
Elliott Hughes
780c43208c
Merge "Remove HAVE_POSIX_CLOCKS."
2015-01-12 18:53:01 +00:00
Christopher Ferris
b773a8d517
am edbd5fd7: Merge "Fix whole static lib handling of duplicate names."
...
* commit 'edbd5fd7e6e7dd54417dee96e230f774903d052b':
Fix whole static lib handling of duplicate names.
2015-01-12 18:48:22 +00:00
Christopher Ferris
edbd5fd7e6
Merge "Fix whole static lib handling of duplicate names."
2015-01-12 18:41:19 +00:00
Baligh Uddin
38299d8569
am 4117b4e3: am cda56ef6: Fix default locale issue (cherry picked from commit 2a52f5c526)
...
* commit '4117b4e3bd50e76135375da84b8754a0fade7c3e':
Fix default locale issue (cherry picked from commit 2a52f5c526 )
2015-01-12 04:15:19 +00:00
Baligh Uddin
4117b4e3bd
am cda56ef6: Fix default locale issue (cherry picked from commit 2a52f5c526)
...
* commit 'cda56ef6da7216798f6791769f3e1f148bb119e2':
Fix default locale issue (cherry picked from commit 2a52f5c526 )
2015-01-12 04:07:49 +00:00
Baligh Uddin
cda56ef6da
Fix default locale issue
...
(cherry picked from commit 2a52f5c526 )
Change-Id: Ic59dd105d60c2dd44f60ed9f57b7e1381924080d
2015-01-11 23:10:44 +00:00
Elliott Hughes
d7e6a0b1c5
Remove HAVE_POSIX_CLOCKS.
...
Change-Id: Ide6f54f70bc5edda9ec1f1f05ebaa0acf58aaa77
2015-01-09 16:27:41 -08:00
Elliott Hughes
b4fc586794
am 5368c02a: Merge "Remove HAVE_PRCTL."
...
* commit '5368c02ac68dc263284bf0cfb1869f0de3f5f5fa':
Remove HAVE_PRCTL.
2015-01-09 23:38:53 +00:00
Elliott Hughes
5368c02ac6
Merge "Remove HAVE_PRCTL."
2015-01-09 23:30:19 +00:00
Elliott Hughes
73498235d2
Remove HAVE_PRCTL.
...
Change-Id: Ic58f8e4c0f749bbc19e5d14de8d99321e7cf833c
2015-01-09 15:24:31 -08:00
Elliott Hughes
37019a1de6
am d9de8e0d: Merge "Remove HAVE_SYS_SOCKET_H."
...
* commit 'd9de8e0d9acd17a2406d25bb970c615067d2ba34':
Remove HAVE_SYS_SOCKET_H.
2015-01-09 22:48:16 +00:00
Elliott Hughes
d9de8e0d9a
Merge "Remove HAVE_SYS_SOCKET_H."
2015-01-09 22:40:36 +00:00
Elliott Hughes
93a24c020f
Remove HAVE_SYS_SOCKET_H.
...
Change-Id: I9ee38c603e3933b012da818b386cb374eec9fe21
2015-01-09 12:22:24 -08:00
Brian Carlstrom
ad156cdd8d
am a0b98c73: Merge "[MIPS64] Set ART base address for mips64"
...
* commit 'a0b98c738012d5bc37356bd0b16ad9c965ec56dd':
[MIPS64] Set ART base address for mips64
2015-01-09 19:36:39 +00:00
Brian Carlstrom
a0b98c7380
Merge "[MIPS64] Set ART base address for mips64"
2015-01-09 19:23:40 +00:00
Brian Carlstrom
d169346b05
am 7a1125bc: Merge "Make TARGET_CPU_VARIANT the same as TARGET_ARCH_VARIANT for Mips."
...
* commit '7a1125bc632e150b934538036102807374406d2f':
Make TARGET_CPU_VARIANT the same as TARGET_ARCH_VARIANT for Mips.
2015-01-09 18:02:20 +00:00
Brian Carlstrom
7a1125bc63
Merge "Make TARGET_CPU_VARIANT the same as TARGET_ARCH_VARIANT for Mips."
2015-01-09 17:51:58 +00:00
Miao Wang
de00ebbe24
am caf44db2: Merge "Add build rules for 64bit Renderscript Compat lib."
...
* commit 'caf44db2d1d829a001d5b0ac8371d33928b3d575':
Add build rules for 64bit Renderscript Compat lib.
2015-01-09 17:48:22 +00:00
Miao Wang
caf44db2d1
Merge "Add build rules for 64bit Renderscript Compat lib."
2015-01-09 17:38:47 +00:00
Jeff Davidson
ee65f03b3c
am dd198b77: Merge "Move installed module dependency setup after proto handling."
...
* commit 'dd198b77a1bae9974b741cc7d1dad328dce3c3b6':
Move installed module dependency setup after proto handling.
2015-01-09 02:51:41 +00:00
Jeff Davidson
dd198b77a1
Merge "Move installed module dependency setup after proto handling."
2015-01-09 02:37:16 +00:00
Jeff Davidson
680f071ca4
Move installed module dependency setup after proto handling.
...
The proto handling will modify the set of dependent libraries, but
this was not actually accounted for in dependency handling because
dependencies had already been established.
Change-Id: Iba1582f3c9eeeada19569e4b5358b6ec4168fccc
2015-01-08 18:25:30 -08:00
Miao Wang
e4359cf0f3
Add build rules for 64bit Renderscript Compat lib.
...
Change-Id: Iea168f8ecb3b4cf6b9ab6ffefc403eb77ee09000
2015-01-08 17:19:42 -08:00
Jeff Davidson
b1055a195a
Update protobuf library from 2.3 to 2.6.
...
Change-Id: I02d308b01f635307dbb63ea9610db2e56eb1f31b
2015-01-08 16:35:11 -08:00
Douglas Leung
3cf3d78600
Make TARGET_CPU_VARIANT the same as TARGET_ARCH_VARIANT for Mips.
...
This is used to set --instruction-set-variant for dex2oat.
Change-Id: Ic93d1bfab634489e004ccf1195cdcfc767f092ef
2015-01-07 18:50:06 -08:00
Christopher Ferris
44203f3316
Fix whole static lib handling of duplicate names.
...
If LOCAL_WHOLE_STATIC_LIBRARIES contains a library that has
two files that have the same name but are in different
directories, only the first gets included.
This fix detects this case, and uses the m option to ar to force the
duplicate object to the end of the archive. After this, using the p
option gets the correct object file.
Change-Id: I2e183f48cef3c79499d4ab8ff147444611ff938b
2015-01-07 18:19:54 -08:00
David Turner
7a864af1b7
am aa112716: Merge "build_image: Set file system labels on disk images"
...
* commit 'aa112716067167d58d1db37aaf8adc49b83b59a1':
build_image: Set file system labels on disk images
2015-01-07 20:28:17 +00:00
David Turner
aa11271606
Merge "build_image: Set file system labels on disk images"
2015-01-07 20:19:06 +00:00
Elliott Hughes
7d9073cf34
am 405931e9: Merge "Stop defining HAVE_UNWIND_CONTEXT_STRUCT."
...
* commit '405931e961b66b5862a14d75792736ca622f5f34':
Stop defining HAVE_UNWIND_CONTEXT_STRUCT.
2015-01-07 04:46:22 +00:00
Elliott Hughes
405931e961
Merge "Stop defining HAVE_UNWIND_CONTEXT_STRUCT."
2015-01-07 04:34:53 +00:00
Elliott Hughes
30adf15747
Stop defining HAVE_UNWIND_CONTEXT_STRUCT.
...
The only code that still references this is only built for arm, so this
should be a no-op.
Change-Id: I64f40fc68bb387b6309075d158f5bd12f398ef20
2015-01-06 19:14:37 -08:00
Ying Wang
4cdebd4c7b
am 21a1f842: am 961096fa: Remove ancient SDK cleanbuild rule
...
* commit '21a1f842c41b70b981c81c3f1750879e5cfb0ba9':
Remove ancient SDK cleanbuild rule
2015-01-07 02:14:23 +00:00
Ying Wang
21a1f842c4
am 961096fa: Remove ancient SDK cleanbuild rule
...
* commit '961096fadaccc38f38fb840ce621c2a1353b263c':
Remove ancient SDK cleanbuild rule
2015-01-07 02:06:27 +00:00
Ying Wang
961096fada
Remove ancient SDK cleanbuild rule
...
In anceint time we didn't have an "sdk" product so that we had to run
"make sdk" in a device product configuration.
Now we have SDK specific product configuration and we don't do "make
sdk" in device product configuration.
Change-Id: I40d58d51261498017bbe7e574c8128afc77e9b96
2015-01-06 16:49:20 -08:00
Brian Carlstrom
00cee5889c
am ad6dd21e: Merge "Remove unused PRODUCT_TAGS"
...
* commit 'ad6dd21e1ae27941b0c00629b095dd9a9ae2d7c2':
Remove unused PRODUCT_TAGS
2015-01-06 23:59:10 +00:00