Commit Graph

6592 Commits

Author SHA1 Message Date
Elliott Hughes
d7e6a0b1c5 Remove HAVE_POSIX_CLOCKS.
Change-Id: Ide6f54f70bc5edda9ec1f1f05ebaa0acf58aaa77
2015-01-09 16:27:41 -08:00
Elliott Hughes
a4f68ef789 am b4fc5867: am 5368c02a: Merge "Remove HAVE_PRCTL."
* commit 'b4fc586794bfc69b02a0ebae5c75f8369cb95556':
  Remove HAVE_PRCTL.
2015-01-09 23:45:29 +00: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
73498235d2 Remove HAVE_PRCTL.
Change-Id: Ic58f8e4c0f749bbc19e5d14de8d99321e7cf833c
2015-01-09 15:24:31 -08:00
Elliott Hughes
0a276a8a4a am 37019a1d: am d9de8e0d: Merge "Remove HAVE_SYS_SOCKET_H."
* commit '37019a1de6ace9eec11edb28e29c8f42ee7bd379':
  Remove HAVE_SYS_SOCKET_H.
2015-01-09 22:54:13 +00: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
Ying Wang
668ae2506b Let apicheck check both the public API and system API.
Also "make update-api" updates both public API and system API files.

Bug: 18960664
Change-Id: I35e805816e07c8aa4deaeb84b1611923583325e1
2015-01-09 14:23:16 -08:00
Elliott Hughes
93a24c020f Remove HAVE_SYS_SOCKET_H.
Change-Id: I9ee38c603e3933b012da818b386cb374eec9fe21
2015-01-09 12:22:24 -08:00
Brian Carlstrom
25588e7125 am ad156cdd: am a0b98c73: Merge "[MIPS64] Set ART base address for mips64"
* commit 'ad156cdd8d2ea2d98281b6d43a98073a5b86f5ab':
  [MIPS64] Set ART base address for mips64
2015-01-09 19:43:41 +00: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
Miao Wang
962dd8a012 am de00ebbe: am caf44db2: Merge "Add build rules for 64bit Renderscript Compat lib."
* commit 'de00ebbe24185237a1056fde39cfc839534e31da':
  Add build rules for 64bit Renderscript Compat lib.
2015-01-09 17:52:49 +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
ec27a8966c Add build rules for libRSSupportIO (Usage_IO lib for RS compat lib)
bug 12924018

Change-Id: I35af72c1f7788f9fd9cb24bfabdbbad09e865a8b
2015-01-09 09:43:09 -08:00
Miao Wang
caf44db2d1 Merge "Add build rules for 64bit Renderscript Compat lib." 2015-01-09 17:38:47 +00:00
Jeff Davidson
516a656bbe am ee65f03b: am dd198b77: Merge "Move installed module dependency setup after proto handling."
* commit 'ee65f03b3c35e481d1bd1a6f4e8374953d20fe98':
  Move installed module dependency setup after proto handling.
2015-01-09 02:55:32 +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
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
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
Jesse Zhao
5556d5ec1d Merge "DO NOT MERGE: Bundle libc++.so into otatools-package." 2015-01-07 21:20:16 +00:00
Elliott Hughes
dc4ea4f152 am 7d9073cf: am 405931e9: Merge "Stop defining HAVE_UNWIND_CONTEXT_STRUCT."
* commit '7d9073cf34d7ddfc32b1eb6ca1c2292b46be0dd7':
  Stop defining HAVE_UNWIND_CONTEXT_STRUCT.
2015-01-07 04:53:45 +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
14b9b01334 am 4cdebd4c: am 21a1f842: am 961096fa: Remove ancient SDK cleanbuild rule
* commit '4cdebd4c7b71d965c5d5dab9b2194b9624357367':
  Remove ancient SDK cleanbuild rule
2015-01-07 02:20:13 +00: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
Brian Carlstrom
b3fc0c383c am 00cee588: am ad6dd21e: Merge "Remove unused PRODUCT_TAGS"
* commit '00cee5889c0061cfd70dd64166dccca529832025':
  Remove unused PRODUCT_TAGS
2015-01-07 00:57:47 +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
Brian Carlstrom
25b8bb378f Remove unused PRODUCT_TAGS
Bug: 18895001
Change-Id: I2bbb1c04880218eaa06c1eff92280c636260f9ae
2015-01-05 15:33:16 -08:00
Nikola Veljkovic
a57aaa3664 [MIPS64] Set ART base address for mips64
Set ART base address for mips64 to the same value as for mips32.

Change-Id: Idd3a05c87867bce9eb769cfec412102944703a43
2014-12-23 13:50:18 +01:00
Ying Wang
13c165c691 am 183417b2: am ae90c07c: Merge "Disable transitive symbol resolving for arm64."
* commit '183417b2e2bd2db02928dbb49defd3251487523f':
  Disable transitive symbol resolving for arm64.
2014-12-20 01:10:30 +00:00
Ying Wang
183417b2e2 am ae90c07c: Merge "Disable transitive symbol resolving for arm64."
* commit 'ae90c07c9786622acf9ee329282161ed9aea011e':
  Disable transitive symbol resolving for arm64.
2014-12-20 01:05:17 +00:00
Ying Wang
ae90c07c97 Merge "Disable transitive symbol resolving for arm64." 2014-12-20 00:52:24 +00:00
Ying Wang
cf6f808408 Disable transitive symbol resolving for arm64.
The transitive symbol resolving causes build breakage when a binary
has indirect dependency on the NDK library.
We only observed such behaviour in the aarch64 toolchain.

Change-Id: I29e01f16bdfa3aa206cd42d6f07c764fd436873a
2014-12-19 16:37:46 -08:00
Ying Wang
92d6249f83 am aa4c8870: am a1e09b1a: am 98ae7985: Fix using variable intermediates.COMMON before defining.
* commit 'aa4c8870a802e317fda14f0574b00d844a4b4716':
  Fix using variable intermediates.COMMON before defining.
2014-12-19 00:08:15 +00:00
Ying Wang
aa4c8870a8 am a1e09b1a: am 98ae7985: Fix using variable intermediates.COMMON before defining.
* commit 'a1e09b1ae69480143d96624dea7fa1dd0b6f62fe':
  Fix using variable intermediates.COMMON before defining.
2014-12-18 23:39:23 +00:00
Ying Wang
98ae798535 Fix using variable intermediates.COMMON before defining.
In commit e9dd9f2bf we moved "include $(BUILD_SYSTEM)/android_manifest.mk"
forward before the variable intermediates.COMMON gets defined. That's a
mistake.
This change replaced the tentative variables
package_expected_intermediates_COMMON and guessed_intermediates with
their proper counterparts defined in base_rules.mk.
If their values differ in the two file, that's an error and we should
fix.

Bug: 18168693
Change-Id: I2bf17b0476b4a7f97810fbb0bde7630eb8878b53
2014-12-18 15:13:04 -08:00
Ying Wang
f1db7e23d9 Support to build AAR for static Java libraries.
Set up rules to build $(built_aar), if a static Java library has Android
resources.
If you run "tapas my_lib && make dist", my_lib.aar will be built and put
in the DIST_DIR.

Bug: 18759503
Change-Id: I36b912eb7bbab241fe48319115ea320efe77c705
2014-12-18 12:02:38 -08:00
Ying Wang
2902d4585f Add support for prebuilt AARs.
- You can give a .aar as source file to a prebuilt static Java library
  module. The build system will set up dependencies and rules to extract
  classes.jar and other resource files.
- To build against a prebuilt AAR module, use:
  LOCAL_STATIC_JAVA_AAR_LIBRARIES := <module names of aar prebuilt AARs>
  The build system will set up rules to merge the library's
  AndroidManifest.xml with the main AndroidManifest.xml, add the AAR's
  resource dirs and link/merge the AAR's classes.jar.

Bug: 18168693
Change-Id: Ic2c1d20572a93bd98dbc72f8a39e26b459e442c2
(cherry picked from commit e9dd9f2bfc)
2014-12-17 22:27:26 +00:00
Tim Murray
eaaecbf55e am 1d693cec: am 39a5bba4: Merge "disable Krait for Mac builds to avoid assembler issues"
* commit '1d693cecc67cdbcde59d421ab60ef74f80505cf4':
  disable Krait for Mac builds to avoid assembler issues
2014-12-17 02:21:07 +00:00
Tim Murray
1d693cecc6 am 39a5bba4: Merge "disable Krait for Mac builds to avoid assembler issues"
* commit '39a5bba4726016b1d92c181cb464bfb0ffabab22':
  disable Krait for Mac builds to avoid assembler issues
2014-12-17 01:13:09 +00:00
Tim Murray
39a5bba472 Merge "disable Krait for Mac builds to avoid assembler issues" 2014-12-17 00:59:22 +00:00
Ying Wang
366de0b484 am 912da645: am 73a730ca: Merge "Remove libdvm support from the core build system."
* commit '912da64598a5175d6e5868c22977eda95f2a9df1':
  Remove libdvm support from the core build system.
2014-12-16 21:58:10 +00:00
Brian Carlstrom
37992c8bc7 am c38439a5: am 8c5401c1: Merge "Remove obsolete PRODUCT_DEX_PREOPT_.*_IN_DATA"
* commit 'c38439a5fff55322900948cb36c2cf6f38b50bb3':
  Remove obsolete PRODUCT_DEX_PREOPT_.*_IN_DATA
2014-12-16 21:49:18 +00:00
Ying Wang
912da64598 am 73a730ca: Merge "Remove libdvm support from the core build system."
* commit '73a730caf566fb778ad36f6d991666c482918d22':
  Remove libdvm support from the core build system.
2014-12-16 21:47:13 +00:00
Ying Wang
73a730caf5 Merge "Remove libdvm support from the core build system." 2014-12-16 21:38:41 +00:00