Ying Wang
8209d993da
Merge "Support to build apk odex for both arch."
2014-09-15 19:14:15 +00:00
Ying Wang
96c2af033d
Enable multilib odex only if TARGET_2ND_ARCH is defined.
...
Bug: 17507247
Bug: 14694978
Change-Id: I160a37bc0970315054606829aa112b67eaee7d49
2014-09-15 12:12:36 -07:00
Ying Wang
2e9f639282
Support to build apk odex for both arch.
...
Build odex for both arch in multilib build if an app has
LOCAL_MULTILIB := both.
Refactored the common setup code to a separate file setup_one_odex.mk.
Bug: 17409149
Bug: 14694978
Change-Id: I74c9426cd74fe0b0cb4811368f740a88ac2ae022
2014-09-15 12:12:18 -07:00
Ying Wang
7a8991991f
Enable multilib odex only if TARGET_2ND_ARCH is defined.
...
Bug: 17507247
Bug: 14694978
Change-Id: I160a37bc0970315054606829aa112b67eaee7d49
2014-09-15 11:45:52 -07:00
Ying Wang
55927b0668
am ce851e88
: Merge "Support to build apk odex for both arch." into lmp-dev
...
* commit 'ce851e88d9b1a0d934f1a564b3a400782d12e0d3':
Support to build apk odex for both arch.
2014-09-14 21:15:57 +00:00
Ying Wang
ce851e88d9
Merge "Support to build apk odex for both arch." into lmp-dev
2014-09-14 20:49:14 +00:00
Ying Wang
db48da7844
Support to build apk odex for both arch.
...
Build odex for both arch in multilib build if an app has
LOCAL_MULTILIB := both.
Refactored the common setup code to a separate file setup_one_odex.mk.
Bug: 17409149
Bug: 14694978
Change-Id: I74c9426cd74fe0b0cb4811368f740a88ac2ae022
2014-09-13 18:14:15 -07:00
Tyler Gunn
260abc8a10
am 6156bcad
: Renaming Telecomm to Telecom.
...
* commit '6156bcad42b8a08dcf41b7cb12be90d2c6d02cf5':
Renaming Telecomm to Telecom.
2014-09-13 18:03:13 +00:00
Tyler Gunn
6156bcad42
Renaming Telecomm to Telecom.
...
- Changing reference from Telecomm to Telecom.
Bug: 17364651
Change-Id: I5b7200396dfc5f0d4c62f9a1aa50bd4fdc04fccf
2014-09-12 20:06:57 -07:00
Brian Carlstrom
1ac92695c2
am f70dcab1
: am c3aeddd3
: Merge "Fix mma/mmma by making gettop canonicalize TOP when set"
...
* commit 'f70dcab1bf313f02e9a3bea0d1bf75ce28457776':
Fix mma/mmma by making gettop canonicalize TOP when set
2014-09-12 22:47:03 +00:00
Brian Carlstrom
f70dcab1bf
am c3aeddd3
: Merge "Fix mma/mmma by making gettop canonicalize TOP when set"
...
* commit 'c3aeddd331a62ebe7a4d6d6e5892cbe35222d6e7':
Fix mma/mmma by making gettop canonicalize TOP when set
2014-09-12 22:29:00 +00:00
Brian Carlstrom
c3aeddd331
Merge "Fix mma/mmma by making gettop canonicalize TOP when set"
2014-09-12 22:18:11 +00:00
Jeff Arneson
3b62f196e1
am faa1dc5c
: Merge "Show annotation information for fields, enums, etc. and in the class list" into lmp-dev
...
* commit 'faa1dc5c016c18bb7e224bb7f16f41989d1d7c23':
Show annotation information for fields, enums, etc. and in the class list
2014-09-12 19:20:17 +00:00
Brian Carlstrom
16b5cd832f
am 0c837a09
: Merge "Fix mma/mmma by making gettop canonicalize TOP when set" into lmp-dev
...
* commit '0c837a093e9c6952885ef370a34b82213f12300c':
Fix mma/mmma by making gettop canonicalize TOP when set
2014-09-12 18:53:26 +00:00
Esteban Talavera
f69ff0e07f
am aaaf5025
: Merge "Added new \'adb dpm\' command to the packages list." into lmp-dev
...
* commit 'aaaf5025b6ecca2815d32c0c78557686b68baac6':
Added new 'adb dpm' command to the packages list.
2014-09-12 18:53:25 +00:00
Jeff Arneson
faa1dc5c01
Merge "Show annotation information for fields, enums, etc. and in the class list" into lmp-dev
2014-09-12 18:24:59 +00:00
Brian Carlstrom
0ff3aba580
Fix mma/mmma by making gettop canonicalize TOP when set
...
Bug: 17253957
(cherry picked from commit a5c4f178ae
)
Change-Id: Id5f5a6e9c81d4332ef5a846423ea41384a053db6
2014-09-12 09:37:25 -07:00
Brian Carlstrom
0c837a093e
Merge "Fix mma/mmma by making gettop canonicalize TOP when set" into lmp-dev
2014-09-12 16:36:21 +00:00
Esteban Talavera
aaaf5025b6
Merge "Added new 'adb dpm' command to the packages list." into lmp-dev
2014-09-12 10:35:48 +00:00
Brian Carlstrom
a5c4f178ae
Fix mma/mmma by making gettop canonicalize TOP when set
...
Bug: 17253957
Change-Id: Ifd6d5984f63981e1f99b6ae6f9459c2801588459
2014-09-12 00:33:25 -07:00
Ying Wang
6d30b05e0e
am 5ae4286b
: Merge "Conditionally skip boot jars package name check." into lmp-dev
...
* commit '5ae4286b94813171982ff7fdebe88fd29fe7e590':
Conditionally skip boot jars package name check.
2014-09-12 05:43:07 +00:00
Raphael Moll
fac497340f
am 24494187
: Merge "SDK Addon multi-sys-img support, part 4." into lmp-dev
...
* commit '24494187def3472dca81db6ae782c7d1246c1056':
SDK Addon multi-sys-img support, part 4.
2014-09-12 05:43:06 +00:00
Dan Albert
9b0a5cb861
am 66927151
: Missed one part of removing the vbox target.
...
* commit '6692715135b38ec24f8f22e0219737f7d3fadbc2':
Missed one part of removing the vbox target.
2014-09-12 05:43:05 +00:00
Dan Albert
46be31aa26
am b7af531e
: Remove the vbox target from the build system.
...
* commit 'b7af531ecc9ccd8f2fe3344429536d6a5b32218a':
Remove the vbox target from the build system.
2014-09-12 05:43:04 +00:00
Ying Wang
5ae4286b94
Merge "Conditionally skip boot jars package name check." into lmp-dev
2014-09-12 01:15:56 +00:00
Ying Wang
46526ff69e
Conditionally skip boot jars package name check.
...
In PDK build, or when a product adds its own boot jars we skip the
check.
Bug: 17434570
Change-Id: I9096ebfa38280c5d2ca84bdc489b455876103f5d
2014-09-11 17:40:29 -07:00
Raphael Moll
24494187de
Merge "SDK Addon multi-sys-img support, part 4." into lmp-dev
2014-09-11 22:28:40 +00:00
Dan Albert
6692715135
Missed one part of removing the vbox target.
...
Change-Id: I8edb5252b5e71de042b79cb9eb2a497d89efb773
(cherry picked from commit bfbd41edcb
)
2014-09-11 13:48:50 -07:00
Dan Albert
b7af531ecc
Remove the vbox target from the build system.
...
I've been told this is no longer in use, and it's the only user of
external/grub, which is distressingly out of date.
Change-Id: I434a55e0d68f6db97fa71e294e983ff1802e9ba6
(cherry picked from commit de21059acf
)
2014-09-11 13:48:15 -07:00
Ying Wang
b091412083
am 48c37182
: Merge "Check PRODUCT_BOOT_JARS against a whitelist of package names." into lmp-dev
...
* commit '48c37182f0df4ace331d7b546c7840ef67b13883':
Check PRODUCT_BOOT_JARS against a whitelist of package names.
2014-09-11 18:32:38 +00:00
Doug Zongker
f0c58d8135
am b34fcce0
: explicitly check the superblock for differences
...
* commit 'b34fcce08cc9ab358481e672d83ff16513c4ac37':
explicitly check the superblock for differences
2014-09-11 18:30:54 +00:00
Ying Wang
48c37182f0
Merge "Check PRODUCT_BOOT_JARS against a whitelist of package names." into lmp-dev
2014-09-11 18:06:52 +00:00
Jeff Arneson
9eefef66a8
Show annotation information for fields, enums, etc. and in the class list
...
Add the "Included in documentation due to annotations..." text for
fields, enum constants, and pretty much everything with a description.
Added annotation text to eh classes.cs file used to generate the
class list page.
Change-Id: I2685d1a34fa292088c03ccd76f2627fe954c9000
2014-09-11 11:04:58 -07:00
Esteban Talavera
b8ef1188e7
Added new 'adb dpm' command to the packages list.
...
Bug: 17312478, 17316711
Change-Id: I2613178ea82a6c6268e7f8012e74c4a852fea0d4
2014-09-11 17:52:08 +01:00
Doug Zongker
b34fcce08c
explicitly check the superblock for differences
...
When generating incrementals for the system and vendor partitions,
check the first block (which contains the superblock) of the partition
to see if it's what we expect. If this check fails, give an explicit
log message about the partition having been remounted R/W (the most
likely explanation) and the need to flash to get OTAs working again.
Bug: 17393999
Change-Id: Ifd2132b428dbc4907527291712690204a3664ac0
2014-09-11 09:38:01 -07:00
Dan Albert
588011a905
am 5f8e7ff6
: am 1feb478d
: Merge "Missed one part of removing the vbox target."
...
* commit '5f8e7ff67602a1ac14994c4aad6fd5d194b68d57':
Missed one part of removing the vbox target.
2014-09-11 02:54:57 +00:00
Dan Albert
5f8e7ff676
am 1feb478d
: Merge "Missed one part of removing the vbox target."
...
* commit '1feb478d28cfb427650e4cd2752bcd988b3258e6':
Missed one part of removing the vbox target.
2014-09-11 01:42:49 +00:00
Dan Albert
1feb478d28
Merge "Missed one part of removing the vbox target."
2014-09-11 01:32:06 +00:00
Jeff Arneson
9910016592
am 0052f75f
: Merge "Make the text generated by showAnnotations more noticable in docs" into lmp-dev
...
* commit '0052f75f88abbe4d16ff3b921be78b848fd4f6f9':
Make the text generated by showAnnotations more noticable in docs
2014-09-11 00:23:00 +00:00
Jeff Arneson
0052f75f88
Merge "Make the text generated by showAnnotations more noticable in docs" into lmp-dev
2014-09-11 00:02:23 +00:00
Ying Wang
634e7df1c8
am acaada12
: Use existing my_32_64_bit_suffix.
...
* commit 'acaada12731639e3feba1dd83d7e44765ec8556c':
Use existing my_32_64_bit_suffix.
2014-09-10 23:32:46 +00:00
Dan Albert
38dc420e19
resolved conflicts for merge of fa21f9db
to lmp-dev-plus-aosp
...
Change-Id: I8cd590e7e6f764d6651dcaacd4beb8c72a23164f
2014-09-10 16:15:18 -07:00
Ying Wang
acaada1273
Use existing my_32_64_bit_suffix.
...
Change-Id: I75d9733870c37a44ce55ae6cbcfb3f67e1387e9d
2014-09-10 16:11:41 -07:00
Tim Murray
c0bdd15b10
am fabd3c00
: Merge "Pass -m32 or -m64 to llvm-rs-cc when reflecting C++." into lmp-dev
...
* commit 'fabd3c00b461c921cb745acd62e7b07b4e938241':
Pass -m32 or -m64 to llvm-rs-cc when reflecting C++.
2014-09-10 22:58:37 +00:00
Dan Albert
bfbd41edcb
Missed one part of removing the vbox target.
...
Change-Id: I8edb5252b5e71de042b79cb9eb2a497d89efb773
2014-09-10 15:58:20 -07:00
Dan Albert
fa21f9db1c
am 30dbfce5
: Merge "Remove the vbox target from the build system."
...
* commit '30dbfce52fdf3ec554b1818ac40fea734e8eac3f':
Remove the vbox target from the build system.
2014-09-10 22:39:26 +00:00
Tim Murray
fabd3c00b4
Merge "Pass -m32 or -m64 to llvm-rs-cc when reflecting C++." into lmp-dev
2014-09-10 22:35:58 +00:00
Dan Albert
30dbfce52f
Merge "Remove the vbox target from the build system."
2014-09-10 22:31:42 +00:00
Tim Murray
f0020c6157
Pass -m32 or -m64 to llvm-rs-cc when reflecting C++.
...
bug 17417839
Change-Id: Iea4aede874f751ac732c3e3ae7a11e18613edcf5
2014-09-10 15:11:01 -07:00
Dan Albert
de21059acf
Remove the vbox target from the build system.
...
I've been told this is no longer in use, and it's the only user of
external/grub, which is distressingly out of date.
Change-Id: I434a55e0d68f6db97fa71e294e983ff1802e9ba6
2014-09-10 15:10:31 -07:00