Commit Graph

6536 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Brian Carlstrom
c38439a5ff am 8c5401c1: Merge "Remove obsolete PRODUCT_DEX_PREOPT_.*_IN_DATA"
* commit '8c5401c1c6a5dfd87c4b0f0edc45810e35b93e40':
  Remove obsolete PRODUCT_DEX_PREOPT_.*_IN_DATA
2014-12-16 20:35:18 +00:00
Ying Wang
d54520a667 Remove libdvm support from the core build system.
Now libart is the only supported runtime and
we don't need the build variables PRODUCT_RUNTIMES and
DALVIK_VM_LIB.

Bug: 18465297
Change-Id: Ibfda931cde0649163d79b584fb5ccad927a9bc2b
2014-12-16 10:08:00 -08:00
Brian Carlstrom
2bc19019e5 Remove obsolete PRODUCT_DEX_PREOPT_.*_IN_DATA
Bug: 18673991
Change-Id: I64261ef6a37df92eeef8552b8fd0a67157e4a034
2014-12-15 22:09:58 -08:00
Elliott Hughes
97d1d8de84 am 91e724d4: Merge "Remove HAVE_SCHED_H."
* commit '91e724d42f921dd35943cdc89e8f4c4362da691a':
  Remove HAVE_SCHED_H.
2014-12-15 19:27:19 +00:00
Elliott Hughes
1f2977f114 Remove HAVE_SCHED_H.
Change-Id: I1308b90c4b33d0ab1a01de44bebba03687217f2b
2014-12-14 16:55:11 -08:00
Elliott Hughes
695a080462 am 55e21af2: Merge "Remove unused OS_SHARED_LIB_FORMAT_STR."
* commit '55e21af2079b7f44b7aa70d8ba08075e8a79ff38':
  Remove unused OS_SHARED_LIB_FORMAT_STR.
2014-12-13 18:59:39 +00:00
Elliott Hughes
da225948e6 Remove unused OS_SHARED_LIB_FORMAT_STR.
Change-Id: Ibaaf112c5a6bfe2084fe34e32e31bcd755e718a8
2014-12-12 15:54:56 -08:00
Ying Wang
b283ef2c3b am 18eee18e: am 60686586: Add product variable PRODUCT_AAPT_PREBUILT_DPI
* commit '18eee18e6e51da4857054376ad96add16c0c0b92':
  Add product variable PRODUCT_AAPT_PREBUILT_DPI
2014-12-11 00:07:38 +00:00
Ying Wang
18eee18e6e am 60686586: Add product variable PRODUCT_AAPT_PREBUILT_DPI
* commit '60686586a5f9c8f78b9ad16e19782da85e89a760':
  Add product variable PRODUCT_AAPT_PREBUILT_DPI
2014-12-10 22:19:49 +00:00
Ying Wang
60686586a5 Add product variable PRODUCT_AAPT_PREBUILT_DPI
We use search LOCAL_DPI_VARIANTS in the list of
"$(PRODUCT_AAPT_PREF_CONFIG) $(PRODUCT_AAPT_PREBUILT_DPI)"
and the first takes precedence.
That way if we don't have a best match, we fall back to the second best,
the way how it worked with PRODUCT_AAPT_CONFIG previously.

Bug: 18388705
Change-Id: I8bd646c52215c65cc6e38c728857af9b64d13469
2014-12-10 12:40:09 -08:00
Tim Murray
7c40fb95dc disable Krait for Mac builds to avoid assembler issues
Change-Id: Ie98f4dbc2cef92798ec08b43b93e7e0339a92a92
2014-12-09 14:28:57 -08:00
Dan Albert
023fd1fca8 am e98755f9: Merge "Add a SANITIZE_HOST flag."
* commit 'e98755f9d6619ff141d099f9da655d141da72b8e':
  Add a SANITIZE_HOST flag.
2014-12-09 13:18:44 +00:00
Dan Albert
ee582aac41 am cd814343: Merge "Let clang decide ASan linker flags for the host."
* commit 'cd814343e897ae8b6d19874163eec8d89c6ae37f':
  Let clang decide ASan linker flags for the host.
2014-12-09 13:18:43 +00:00