Commit Graph

6592 Commits

Author SHA1 Message Date
Elliott Hughes
494dd87179 am 7e2e4505: am e5743ef7: Merge "Remove libdvm dex preopt support."
* commit '7e2e45055d2bb1aba8416a86d14846b68b11c1f4':
  Remove libdvm dex preopt support.
2014-11-18 21:05:58 +00:00
Elliott Hughes
7e2e45055d am e5743ef7: Merge "Remove libdvm dex preopt support."
* commit 'e5743ef73f3a1911f6e2124e9ec3a6d671f6e378':
  Remove libdvm dex preopt support.
2014-11-18 21:02:00 +00:00
Elliott Hughes
436c73931a Kill unused ARCH_* defines.
No one's using ARCH_AARCH64 or AARCH_MIPS64 yet, and ARCH_PPC was always more
aspirational than real.

Change-Id: I07c6cbad6eb0917c4c24848a98c3bc9a3fe72db6
2014-11-18 12:57:34 -08:00
Elliott Hughes
e5743ef73f Merge "Remove libdvm dex preopt support." 2014-11-18 20:52:31 +00:00
Ying Wang
634f7992f0 Use ALL_MODULES.$(m).INSTALLED in modules-for-tag-list
Previously we store tag's installed modules in a separate variable
ALL_MODULE_TAGS.$(tag). However we only record the main installed file
for a module, but omit affiliated files like .odex.
With this change, we handle the tagged module the same way as modules in
PRODUCT_PACKAGES.

Change-Id: I7972528a4df5a4ba8bc98930864da9672d32d7fe
2014-11-18 12:48:07 -08:00
Yabin Cui
767d9fbd10 am 94a14699: am 57ed1ddf: Merge "kill HAVE_TERMIO_H"
* commit '94a146991432a632315442671c1e396fa4196a3d':
  kill HAVE_TERMIO_H
2014-11-18 20:19:51 +00:00
Yabin Cui
94a1469914 am 57ed1ddf: Merge "kill HAVE_TERMIO_H"
* commit '57ed1ddf78ecf7815a1b57137ea42893237a4756':
  kill HAVE_TERMIO_H
2014-11-18 03:46:34 +00:00
Yabin Cui
57ed1ddf78 Merge "kill HAVE_TERMIO_H" 2014-11-18 03:40:34 +00:00
Elliott Hughes
ef8a940f78 Remove libdvm dex preopt support.
libdvm is dead.

Change-Id: Ib8571c007f8a9f0e0eaf5c61b5d2e416b2d95089
2014-11-17 17:49:51 -08:00
Ying Wang
43f7a3226a Support prebuilt apk source selection based on PRODUCT_AAPT_PREF_CONFIG
Two new LOCAL variables are added to support dpi-specific prebuilt apk
selection:
- LOCAL_DPI_VARIANTS: specify a list of dpis the module provides with
  specific prebuilt.
  Example: LOCAL_DPI_VARIANTS := xxhdpi xhdpi hdpi mdpi
- LOCAL_DPI_FILE_STEM: specify the dpi-specific source file name
  pattern.
  Example: LOCAL_DPI_FILE_STEM := MyApp-%.apk
  "%" will be substitued by $(PRODUCT_AAPT_PREF_CONFIG) in the core
  build system.
  If you don't set up LOCAL_DPI_FILE_STEM, the default is
  $(LOCAL_MODULE)_%.apk.

The build system searches $(PRODUCT_AAPT_PREF_CONFIG) in a prebuilt apk
module's $(LOCAL_DPI_VARIANTS). If not found, use whatever
$(LOCAL_SRC_FILES) as the source file; Otherwise use $(LOCAL_DPI_FILE_STEM)
to construct the dpi-specific apk's source file name, and use whatever
directory name of $(LOCAL_SRC_FILES).

Bug: 18388705
Change-Id: I63cae73f1b6f880302142abc476b3ce1fb5500b5
2014-11-17 17:05:27 -08:00
Dan Albert
8e25667f12 am a4ad6442: am 9b0ccb74: Merge "Fix the libgcc/libatomic link order."
* commit 'a4ad6442d6a54c9eaf771a0d4ab7f7ab9de163ac':
  Fix the libgcc/libatomic link order.
2014-11-18 00:07:22 +00:00
Dan Albert
a4ad6442d6 am 9b0ccb74: Merge "Fix the libgcc/libatomic link order."
* commit '9b0ccb7480a0b86d27bb6c7352b5cd5e79bfbf82':
  Fix the libgcc/libatomic link order.
2014-11-18 00:03:54 +00:00
Dan Albert
9b0ccb7480 Merge "Fix the libgcc/libatomic link order." 2014-11-17 23:55:57 +00:00
Miao Wang
11798647e4 am 439458d1: am ec64b05e: Merge "Add -Wl,--hash-style=sysv flag to rs: transform-bc-to-so for compatibility lib."
* commit '439458d1c97c846cab5cd6c09f9f5195f9587ad9':
  Add -Wl,--hash-style=sysv flag to rs: transform-bc-to-so for compatibility lib.
2014-11-17 23:07:18 +00:00
Miao Wang
439458d1c9 am ec64b05e: Merge "Add -Wl,--hash-style=sysv flag to rs: transform-bc-to-so for compatibility lib."
* commit 'ec64b05e9db4c9898d1a6652e58741597261e46a':
  Add -Wl,--hash-style=sysv flag to rs: transform-bc-to-so for compatibility lib.
2014-11-17 22:58:46 +00:00
Yabin Cui
a16825ff7a kill HAVE_TERMIO_H
Bug: 18398307
Change-Id: I54fc0235fbc40630f8024570b928dba115b1c39a
2014-11-17 14:49:39 -08:00
Miao Wang
ec64b05e9d Merge "Add -Wl,--hash-style=sysv flag to rs: transform-bc-to-so for compatibility lib." 2014-11-17 21:25:24 +00:00
Dan Albert
a569b83842 am 330f808b: am f63ca1e9: Merge "Disable gnu style linker hash for NDK builds."
* commit '330f808b24dd3ee1b90bdd8b0e7e36ccca32e8b3':
  Disable gnu style linker hash for NDK builds.
2014-11-17 20:39:45 +00:00
Dan Albert
330f808b24 am f63ca1e9: Merge "Disable gnu style linker hash for NDK builds."
* commit 'f63ca1e9ea392d6aea7e2cfd6239d904e6ae017d':
  Disable gnu style linker hash for NDK builds.
2014-11-17 20:35:06 +00:00
Dan Albert
f63ca1e9ea Merge "Disable gnu style linker hash for NDK builds." 2014-11-17 20:29:43 +00:00
Ying Wang
0c9b3bac65 Install preloaded-classes as a standalone configuration file
Install preloaded-classes as a standalone configuration file
/system/etc/preloaded-classes, so we can configure different file per product.
To override the default frameworks/base/preloaded-classes, just override
in your product configuration makefile with PRODUCT_COPY_FILES before it
inherits from build/target/product/base.mk: if there are multiple items
in PRODUCT_COPY_FILES with the same destination, the first one takes
precedence.

Bug: 18305157
Change-Id: I937632b4a1aa73310ec90e73fd708fbd0c704a21
2014-11-17 11:26:29 -08:00
Ying Wang
2416273d5f am 4aa4de96: am 9a0a8bd0: am 9a9d180f: Install preloaded-classes as a standalone configuration file
* commit '4aa4de961b0a62c4863736ac79efc6a4c07ffc1d':
  Install preloaded-classes as a standalone configuration file
2014-11-17 18:34:13 +00:00
Ying Wang
4aa4de961b am 9a0a8bd0: am 9a9d180f: Install preloaded-classes as a standalone configuration file
* commit '9a0a8bd00697fd6dd3e7dd6fb5dcf3697dc27507':
  Install preloaded-classes as a standalone configuration file
2014-11-17 18:28:19 +00:00
Ying Wang
9a0a8bd006 am 9a9d180f: Install preloaded-classes as a standalone configuration file
* commit '9a9d180ff1cafc547bd9d3b31a10db749d8ab359':
  Install preloaded-classes as a standalone configuration file
2014-11-17 18:24:27 +00:00
Dan Albert
7d9b27c593 am 71b0d7b2: am 8df7653d: Merge "Remove logic for platform stlport gtest."
* commit '71b0d7b25065b2be35248380c3b98b0f77d27bd6':
  Remove logic for platform stlport gtest.
2014-11-15 23:54:24 +00:00
Dan Albert
71b0d7b250 am 8df7653d: Merge "Remove logic for platform stlport gtest."
* commit '8df7653d5608e5d459758a91e6c677c7d5fcc43f':
  Remove logic for platform stlport gtest.
2014-11-15 23:49:27 +00:00
Dan Albert
8df7653d56 Merge "Remove logic for platform stlport gtest." 2014-11-15 23:42:15 +00:00
Miao Wang
e23e8080c6 Add -Wl,--hash-style=sysv flag to rs: transform-bc-to-so for compatibility lib.
Bug 18395015

Change-Id: Ib9aecf347c685c8b8b725eecfbc0cec03d9b2c1b
2014-11-15 14:25:33 -08:00
Dan Albert
d3d894da74 Disable gnu style linker hash for NDK builds.
This feature is now available in AOSP, but not for any shipped
release. We don't have an API version for the release that this will
be available in yet, so for now the check is commented out.

Bug: 18395015
Change-Id: I247233d047ed5a7564d6602d47c9ad962313c8dc
2014-11-15 01:50:52 +00:00
Ying Wang
9a9d180ff1 Install preloaded-classes as a standalone configuration file
Install preloaded-classes as a standalone configuration file
/system/etc/preloaded-classes, so we can configure different file per product.
To override the default frameworks/base/preloaded-classes, just override
in your product configuration makefile with PRODUCT_COPY_FILES before it
inherits from build/target/product/base.mk: if there are multiple items
in PRODUCT_COPY_FILES with the same destination, the first one takes
precedence.

Bug: 18305157
Change-Id: I937632b4a1aa73310ec90e73fd708fbd0c704a21
2014-11-14 15:38:54 -08:00
Dan Albert
cf559ed073 am 7d5fe242: am a05a04cc: Merge "Refactor transform-o-to-* definitions."
* commit '7d5fe24251846ef70f423f15bf941be35750c2e8':
  Refactor transform-o-to-* definitions.
2014-11-14 19:31:56 +00:00
Paul Lawrence
8d566e1b5c am fb441593: am 9ebb0067: am a37b2bb2: Fix the build
* commit 'fb4415934cb611f6a2941257aa498ed8701ec16b':
  Fix the build
2014-11-14 19:18:47 +00:00
Dmitriy Ivanov
cd0a67381d am 0cd1bbd0: am 3537692d: Merge "Switch --hash-style to gnu"
* commit '0cd1bbd04844e723fda58b63565ab7167b9522ad':
  Switch --hash-style to gnu
2014-11-14 19:18:45 +00:00
Ian Rogers
477f4d016a am 296fb4c7: am 93efec89: Merge "Pass instruction set variant to dex2oat."
* commit '296fb4c77cf04aeb6ffdcdd5a94578a180f7a3a2':
  Pass instruction set variant to dex2oat.
2014-11-14 19:18:10 +00:00
Yabin Cui
b2340dea94 am 6da76118: am eddd9fb0: Merge "kill HAVE_FORKEXEC"
* commit '6da761189057c48f2eb75ecd811e8da62a292e4b':
  kill HAVE_FORKEXEC
2014-11-14 19:15:45 +00:00
Yabin Cui
78b42992d8 am b4157cd7: am d3d6c383: Merge "kill HAVE_LOCALTIME_R"
* commit 'b4157cd7c5d36601288a9e2a49659427d1bd7ff9':
  kill HAVE_LOCALTIME_R
2014-11-14 18:55:01 +00:00
Dan Albert
7d5fe24251 am a05a04cc: Merge "Refactor transform-o-to-* definitions."
* commit 'a05a04cc754a6374c2ce6406dece9bbafa0abea0':
  Refactor transform-o-to-* definitions.
2014-11-14 18:09:48 +00:00
Dan Albert
a05a04cc75 Merge "Refactor transform-o-to-* definitions." 2014-11-14 18:01:21 +00:00
Dan Albert
741b36e922 Fix the libgcc/libatomic link order.
The previous position of libgcc.a/libatomic.a on the link line causes
the linker to prefer satisfying dependencies from these libraries from
other libraries that might include them, rather than from libgcc.a (or
libatomic.a) itself. This imposes an ABI requirement that those
intermediate shared libraries _always_ export those symbols, which is
undesirable.

Change-Id: Ib593236b475d3e98356b2b1be6f96cee2b67378f
2014-11-13 21:29:28 -08:00
Paul Lawrence
fb4415934c am 9ebb0067: am a37b2bb2: Fix the build
* commit '9ebb00679946cda44c5abdadaafa6c45b2cdcb29':
  Fix the build
2014-11-14 02:18:23 +00:00
Dmitriy Ivanov
0cd1bbd048 am 3537692d: Merge "Switch --hash-style to gnu"
* commit '3537692df3f64f68bf202d9857ae67e19bc4eaa4':
  Switch --hash-style to gnu
2014-11-14 02:13:13 +00:00
Paul Lawrence
9ebb006799 am a37b2bb2: Fix the build
* commit 'a37b2bb236486d5fc9158dbc66d1ff73a63c6e81':
  Fix the build
2014-11-14 02:12:48 +00:00
Paul Lawrence
a37b2bb236 Fix the build
Bug: 15984840
Bug: 18120110
Change-Id: I0224d5a31e03b711953d9496ecb00b6d88b8ef4c
2014-11-14 02:04:33 +00:00
Dmitriy Ivanov
3537692df3 Merge "Switch --hash-style to gnu" 2014-11-14 01:47:00 +00:00
Yabin Cui
1584bbe56b am faddef70: am 044568be: Merge "kill HAVE_GETHOSTBYNAME_R"
* commit 'faddef7018c815487d7608a43257075ebf4b9859':
  kill HAVE_GETHOSTBYNAME_R
2014-11-14 00:47:29 +00:00
Elliott Hughes
b153c3a190 am cc12050f: am 6c706222: Merge "Remove HAVE_SHORT_ENUMS."
* commit 'cc12050f3499313ce66f82d09be2920e42d1c062':
  Remove HAVE_SHORT_ENUMS.
2014-11-14 00:42:15 +00:00
Ian Rogers
296fb4c77c am 93efec89: Merge "Pass instruction set variant to dex2oat."
* commit '93efec89e067c5fe6f4585a5f0f033826310ee76':
  Pass instruction set variant to dex2oat.
2014-11-14 00:34:24 +00:00
Ian Rogers
93efec89e0 Merge "Pass instruction set variant to dex2oat." 2014-11-14 00:21:52 +00:00
Dan Albert
e088c0d281 Refactor transform-o-to-* definitions.
Previously, there was one generic definition for each of the
transform-o-to-* functions in definitions.mk, and one target specific
one in each combo/TARGET_*.mk. The generic one was entirely unused,
and the target specific ones were all nearly identical.

Changing anything in these functions was tedious at best, and often
error prone. The differences between any 32-bit arch and its 64-bit
equivalent were restricted to the name of the linker, and the ARM and
MIPS definitions were identical. The few differences between ARM and
x86 looked to be compatibility for an old (ca. 2008) toolchain issue
with --gc-sections, and a bug (LDFLAGS coming first rather than
later).

To simplify things, I've moved the definitions for these out of
combo/TARGET_*.mk and back into definitions.mk. The differences
between ARM and x86 have been scrapped. Anything that really does
still need to be target specific can be handled as I have the linker:
add a TARGET_FOO variable to the given target and then add it to the
generic definition.

Change-Id: I54dc1bffc32ac39f27f0b87247dd6a6dbaf0b162
2014-11-13 16:21:46 -08:00
Sami Tolvanen
5132315546 am 2a1697d9: am 8d212ea8: DO NOT MERGE: Change verity key formats
* commit '2a1697d9831fc887a32c661fa4e3758f32790e67':
  DO NOT MERGE: Change verity key formats
2014-11-14 00:03:51 +00:00