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
Brian Carlstrom
ad6dd21e1a
Merge "Remove unused PRODUCT_TAGS"
2015-01-06 23:45:38 +00:00
Jeff Arneson
579be06705
am 35764d6f: am ef789fa1: am bb9eda64: am 2ff97d99: am d194c6ac: Merge "Fix Documentation typo when showAnnotations is used with doclava" into lmp-docs
...
* commit '35764d6f99761ed63d2d762be4bddf0a3a1e5e0a':
Fix Documentation typo when showAnnotations is used with doclava
2015-01-06 02:27:21 +00:00
Jeff Arneson
35764d6f99
am ef789fa1: am bb9eda64: am 2ff97d99: am d194c6ac: Merge "Fix Documentation typo when showAnnotations is used with doclava" into lmp-docs
...
* commit 'ef789fa152d0a7649038b41b9ecf7adb1ad4d012':
Fix Documentation typo when showAnnotations is used with doclava
2015-01-06 02:18:22 +00:00
Jeff Arneson
ef789fa152
am bb9eda64: am 2ff97d99: am d194c6ac: Merge "Fix Documentation typo when showAnnotations is used with doclava" into lmp-docs
...
* commit 'bb9eda64a300bbbeffc58798f9af04d332544557':
Fix Documentation typo when showAnnotations is used with doclava
2015-01-06 02:00:09 +00:00
Brian Carlstrom
25b8bb378f
Remove unused PRODUCT_TAGS
...
Bug: 18895001
Change-Id: I2bbb1c04880218eaa06c1eff92280c636260f9ae
2015-01-05 15:33:16 -08:00
Pirama Arumuga Nainar
e019e8206a
am 53ed9df8: Merge "Fix incorrect name for x86 platform\'s gdb"
...
* commit '53ed9df8dcc4930fc314212433c339336f0e1b9f':
Fix incorrect name for x86 platform's gdb
2015-01-05 22:55:43 +00:00
Pirama Arumuga Nainar
53ed9df8dc
Merge "Fix incorrect name for x86 platform's gdb"
2015-01-05 22:45:30 +00:00
Pirama Arumuga Nainar
8c346f6ada
Fix incorrect name for x86 platform's gdb
...
gdbclient looks for 'x86_64-linux-androideabi-gdb' whereas the prebuilts
have gdb as 'x86_64-linux-android-gdb'
$ cd $ANDROID_BUILD_TOP
$ find prebuilts -iname *x86*gdb
prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linux-android-gdb
prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.8/bin/x86_64-linux-android-gdb
prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linux-android-gdb
prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.8/bin/x86_64-linux-android-gdb
Change-Id: Ib940ecd6f345ea501da79834168b91cc0f6e5a96
2015-01-05 14:36:38 -08:00
Christoffer Dall
8ed01f3816
build_image: Set file system labels on disk images
...
When building images set the mount point (data,cache,system) as the
filesystem label on the generated image. This is required for the
Android Emulator.
IMPORTANT: This depends on the following patch to system/extras/:
https://android-review.googlesource.com/#/c/120047/
which has already been submitted to AOSP and merged into the
internal tree.
Change-Id: Iaeb45462570c26d37980f1cc5d8a1b929e476c89
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
2015-01-05 17:49:37 +01: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
Christoffer Dall
b5381366d4
emulator: Include the ranchu sensors library
...
Include the HAL library support for the ranchu sensors emulation
provided for display rotation support on the virtual ranchu emulator
board.
Change-Id: Ibb5e1821d5f8ec9299523332352c2f0938fad687
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
2014-12-21 21:17:45 +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
smain@google.com
cc717505e4
am e6bf9dcd: am 02be1804: am fdb9fa0e: am 351c908b: am 94e0b530: fix bug that allowed only one video in the shadowbox per page bug: 18777918
...
* commit 'e6bf9dcde7d150885a98519512c725066601db10':
fix bug that allowed only one video in the shadowbox per page bug: 18777918
2014-12-19 17:24:04 +00:00
smain@google.com
be8b1630aa
am fa963c73: am 2fbb4e30: am 39bac022: am bfe3fc64: am bf644aa5: remove the Helpouts recruitment banner
...
* commit 'fa963c7379e8e7c9d0fce2c6e24f599bce90b396':
remove the Helpouts recruitment banner
2014-12-19 17:24:03 +00:00
smain@google.com
e6bf9dcde7
am 02be1804: am fdb9fa0e: am 351c908b: am 94e0b530: fix bug that allowed only one video in the shadowbox per page bug: 18777918
...
* commit '02be18043c1fe0a0109139caf65694a29035a1d2':
fix bug that allowed only one video in the shadowbox per page bug: 18777918
2014-12-19 17:15:30 +00:00
smain@google.com
fa963c7379
am 2fbb4e30: am 39bac022: am bfe3fc64: am bf644aa5: remove the Helpouts recruitment banner
...
* commit '2fbb4e30e26e7f3d3ec0e69075641d7343e04e13':
remove the Helpouts recruitment banner
2014-12-19 17:15:29 +00:00
smain@google.com
02be18043c
am fdb9fa0e: am 351c908b: am 94e0b530: fix bug that allowed only one video in the shadowbox per page bug: 18777918
...
* commit 'fdb9fa0e2bdbcc8ffa6b33def29b74bab4ce91ac':
fix bug that allowed only one video in the shadowbox per page bug: 18777918
2014-12-19 17:08:33 +00:00
smain@google.com
2fbb4e30e2
am 39bac022: am bfe3fc64: am bf644aa5: remove the Helpouts recruitment banner
...
* commit '39bac0222bf10bc9f7dd1f3d58391903d669d35a':
remove the Helpouts recruitment banner
2014-12-19 17:08:05 +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
a1e09b1ae6
am 98ae7985: Fix using variable intermediates.COMMON before defining.
...
* commit '98ae79853509bbc1b6ee66ace10295c5d29510c5':
Fix using variable intermediates.COMMON before defining.
2014-12-18 23:34:25 +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
Jeff Arneson
bb9eda64a3
am 2ff97d99: am d194c6ac: Merge "Fix Documentation typo when showAnnotations is used with doclava" into lmp-docs
...
* commit '2ff97d99266623997c09f5af937f98bc8bb2ee65':
Fix Documentation typo when showAnnotations is used with doclava
2014-12-18 17:05:23 +00:00
Jeff Arneson
2ff97d9926
am d194c6ac: Merge "Fix Documentation typo when showAnnotations is used with doclava" into lmp-docs
...
* commit 'd194c6ac80007532596a614c86e3c68e129957e7':
Fix Documentation typo when showAnnotations is used with doclava
2014-12-18 17:00:15 +00:00
Jeff Arneson
d194c6ac80
Merge "Fix Documentation typo when showAnnotations is used with doclava" into lmp-docs
2014-12-18 16:50:13 +00:00
Ying Wang
c11da8ebc5
am 81d110ea: am 2902d458: Add support for prebuilt AARs.
...
* commit '81d110ea5419fb904f37e545646b0523c514437c':
Add support for prebuilt AARs.
2014-12-17 22:43:13 +00:00
Ying Wang
81d110ea54
am 2902d458: Add support for prebuilt AARs.
...
* commit '2902d4585f2a60a91084e96d00f2ee8d8301bf65':
Add support for prebuilt AARs.
2014-12-17 22:37:53 +00: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
smain@google.com
7ad7ff7358
am 2ed92cda: am 19832ae1: am d742274e: am b05558cf: am 3de83c1b: make shadowbox video always centered to fit the window height
...
* commit '2ed92cda0d807ee41f2821deb425f15a023c05b1':
make shadowbox video always centered to fit the window height
2014-12-17 20:32:27 +00:00
smain@google.com
2ed92cda0d
am 19832ae1: am d742274e: am b05558cf: am 3de83c1b: make shadowbox video always centered to fit the window height
...
* commit '19832ae16afd9cf63e6fe02770d7bcee8a338f95':
make shadowbox video always centered to fit the window height
2014-12-17 20:27:00 +00:00
smain@google.com
19832ae16a
am d742274e: am b05558cf: am 3de83c1b: make shadowbox video always centered to fit the window height
...
* commit 'd742274e14a048805a74311b0e5a25e03fc2465c':
make shadowbox video always centered to fit the window height
2014-12-17 20:20:20 +00:00
smain@google.com
fdb9fa0e2b
am 351c908b: am 94e0b530: fix bug that allowed only one video in the shadowbox per page bug: 18777918
...
* commit '351c908b757fcfee03d5f15b4a29cb9a48f93f46':
fix bug that allowed only one video in the shadowbox per page bug: 18777918
2014-12-17 03:31:06 +00:00
smain@google.com
351c908b75
am 94e0b530: fix bug that allowed only one video in the shadowbox per page bug: 18777918
...
* commit '94e0b530868c56547ee05e84534fa68a1f6346f7':
fix bug that allowed only one video in the shadowbox per page bug: 18777918
2014-12-17 03:25:14 +00:00
smain@google.com
94e0b53086
fix bug that allowed only one video in the shadowbox per page
...
bug: 18777918
Change-Id: I07c75f795128165e2f1472112cf8ba1a1ee782c7
2014-12-16 19:07:08 -08:00
Dan Albert
818ce6688d
am b3ad3943: Merge "Revert "Remove libstlport from PRODUCT_PACKAGES.""
...
* commit 'b3ad3943f363ab7c60d17125ac871e31c25b8a7a':
Revert "Remove libstlport from PRODUCT_PACKAGES."
2014-12-17 01:18:27 +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
Dan Albert
b3ad3943f3
Merge "Revert "Remove libstlport from PRODUCT_PACKAGES.""
2014-12-17 01:08:02 +00:00
Tim Murray
39a5bba472
Merge "disable Krait for Mac builds to avoid assembler issues"
2014-12-17 00:59:22 +00:00
Dan Albert
01bf7931eb
Revert "Remove libstlport from PRODUCT_PACKAGES."
...
The platform dependence on stlport is now far enough gone that a
regular build no longer builds stlport (woot!). Unfortunately, vendor
blobs don't claim their dependencies, so the build system has to keep
track of this for them.
Bug: 18777920
This reverts commit ef11722e9b
.
Change-Id: I6a0dd26dfc6837c419eb5dd2ec5258dd323fd4bf
2014-12-16 16:13:06 -08:00
Jeff Arneson
c6e8a05f49
Fix Documentation typo when showAnnotations is used with doclava
...
Bug: 18711752
Change-Id: I1b5fce05063733388f65a6ddddf2522ea14e9e5f
2014-12-16 23:13:40 +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