Andy Huang
400d9ff4ba
Merge "remove Exchange2 from core.mk" into mnc-dr1.5-dev am: 0936632c93
...
am: 624ecb988b
* commit '624ecb988b037a4eee46d06b3618bee1e5d2b9cb':
remove Exchange2 from core.mk
2016-01-13 21:28:07 +00:00
Tom Cherry
6ebff7a4d4
Merge "Remove special case handling of "ro." properties" am: 560fde999a
...
am: ca0091e26f
* commit 'ca0091e26fa31618d4693cad1f572d3e4e12bffe':
Remove special case handling of "ro." properties
2016-01-13 18:50:00 +00:00
Calin Juravle
910581eee5
Enable the use of jit profiles
...
Effects:
- JIT profiles will be saved to disk
- dex2oat daemon will perform profile based compilation
Bug: 26080105
Change-Id: I284106b205ccf26630a8b86923d1219e121c29c2
2016-01-12 16:47:47 -08:00
Tom Cherry
ca0091e26f
Merge "Remove special case handling of "ro." properties"
...
am: 560fde999a
* commit '560fde999ad87379e8adfbe36958a33db4eb1c81':
Remove special case handling of "ro." properties
2016-01-12 20:54:38 +00:00
Jim Kaye
206fb06c2c
Emulator: Have the Settings page say "About emulated device"
...
The Settings page for a real device says "About phone" or
"About tablet". This text is selected at build time, so the
Emulator cannot get the Sytem to choose correctly at launch time.
Our solution is to say "About emulated device" for all types
of virtual devices.
Change-Id: Ia52c20b794f76230f5b73694fb193c18b173c329
2016-01-11 23:41:34 +00:00
Tom Cherry
69035cd4aa
Remove special case handling of "ro." properties
...
Currently, properties that begin with "ro." are special cased to skip
over the "ro." part of the prefix before matching with entries in
property_contexts. A change to init is removing this special case and
therefore, the "ro." prefixes must be explicitly added to
property_contexts.
Bug 26425619
Change-Id: I735eb9fc208eeec284cda8d778db946eeec24192
2016-01-11 13:16:45 -08:00
Narayan Kamath
0abf9152fc
Merge "Remove libsqlite_jni from all product configs." am: 4203ee20f1
...
am: 3eb6d15e6f
* commit '3eb6d15e6f207391f574fa0259e51e3deb391248':
Remove libsqlite_jni from all product configs.
2016-01-11 11:45:56 +00:00
Narayan Kamath
3eb6d15e6f
Merge "Remove libsqlite_jni from all product configs."
...
am: 4203ee20f1
* commit '4203ee20f13b1dd3ec9100f5045c19541f70da33':
Remove libsqlite_jni from all product configs.
2016-01-11 11:43:46 +00:00
Narayan Kamath
58408f645a
Remove libsqlite_jni from all product configs.
...
It's only used by libcore tests so there's no need to ship it on
all products.
bug: 26457850
Change-Id: I907f781d215e94e1cbf554d81fda9e6eed07a4de
2016-01-08 11:02:36 +00:00
Josh Gao
59bee9b831
Merge "Kill BOARD_MALLOC_ALIGNMENT." am: 1ad7edd5e4
...
am: 5774bafd18
* commit '5774bafd181933ca8b5687286fe8734e4f82eda9':
Kill BOARD_MALLOC_ALIGNMENT.
2016-01-06 22:56:02 +00:00
Josh Gao
5774bafd18
Merge "Kill BOARD_MALLOC_ALIGNMENT."
...
am: 1ad7edd5e4
* commit '1ad7edd5e46793bee4450a7d6deadc39538dbf54':
Kill BOARD_MALLOC_ALIGNMENT.
2016-01-06 22:54:05 +00:00
Josh Gao
b1171e4a31
Kill BOARD_MALLOC_ALIGNMENT.
...
Bug: http://b/26403338
Change-Id: I55d2c417d972f78caddc5fb28a065807feb86b0a
2016-01-06 14:15:46 -08:00
Chien-Yu Chen
e677b1af96
Add cameraserver process
...
Bug: 24511454
Change-Id: Ieac05311b3e5deb10c4b255d22ba699dc3cb6a4e
2016-01-05 15:06:52 -08:00
Narayan Kamath
45ae4eb8a2
Merge changes from topic \'aosp-merge-24-12\'
...
am: 8b9589216d
* commit '8b9589216dd8c2a644dab9623952b5fd8a32e550':
Temporary workaround to build bouncycastle / nist-pkits
Build: Build changes for multi oat/image support.
Allow modules to override the default NOTICE file.
Track introduction of libopenjdkjvm.
Allow for 5200 words in dump-words-to-file
Update the package whitelist for the boot image.
Use core-oj alongside core-libart wherever required.
2015-12-24 12:04:50 +00:00
Narayan Kamath
fa257cc709
Track introduction of libopenjdkjvm.
...
(cherry picked from commit 2eb52037e8
)
Change-Id: Ib8683d7e628ae4b09f359ecedc93f77199205cef
2015-12-24 10:10:55 +00:00
Piotr Jastrzebski
052a00f64e
Use core-oj alongside core-libart wherever required.
...
With some core classes moved to separate core-oj jar
we need to use the new jar.
(cherry picked from commit 89b94c827f
)
Change-Id: I025c0adc70535bf23def3ab0ce28a1bfaef72514
2015-12-24 10:10:55 +00:00
Jack Yu
ac978e48eb
Merge "Included CellBroadcastReceiver app to the image."
2015-12-22 23:49:03 +00:00
Jack Yu
17aa86c69e
Included CellBroadcastReceiver app to the image.
...
Included CellBroadcastReceiver app to the image.
bug: 26290349
Change-Id: Icb39909ac2c9f751ad95a28f411b84a0d787ac0d
2015-12-21 11:16:48 -08:00
Narayan Kamath
2eb52037e8
Track introduction of libopenjdkjvm.
...
Change-Id: Ibb0e64b81cb033764a865be1f05be5f3334feaa5
2015-12-18 12:34:45 +00:00
Christopher Ferris
ccaeb65d8e
Add libc_malloc_debug to the always build list.
...
Change-Id: I26e553478b5ef4017aea1e06530931d4b18e308b
2015-12-17 15:15:32 -08:00
Nick Kralevich
bcdc1070d4
Merge "sepolicy: Fix \'avc denied\' issues for the emulators" am: 154657f0e3
...
am: abfd39ae3a
* commit 'abfd39ae3ae34bc4208f23aa040a406c1d7358be':
sepolicy: Fix 'avc denied' issues for the emulators
2015-12-13 13:16:09 -08:00
Nick Kralevich
abfd39ae3a
Merge "sepolicy: Fix \'avc denied\' issues for the emulators"
...
am: 154657f0e3
* commit '154657f0e371a3ff180e8b0936aeaa3d2da9a57c':
sepolicy: Fix 'avc denied' issues for the emulators
2015-12-11 17:14:51 -08:00
Andy Hung
04aa83cfb4
Merge "Add audioserver executable to base config"
2015-12-11 20:08:51 +00:00
Mike Frysinger
c15373f60e
Merge "sepolicy: drop -- marker" am: 50f21eb113
...
am: 86f12e6dcb
* commit '86f12e6dcb5b321f4346f9442cb390ba032454c8':
sepolicy: drop -- marker
2015-12-11 09:00:23 -08:00
Miroslav Tisma
36a76ec098
sepolicy: Fix 'avc denied' issues for the emulators
...
This commit fixes the avc denied issues in the emulators:
- goldfish_setup is granted for network access
- netd dontaudit for sys_module
- qemu_prop is granted domain for get_prop
Critical issue was that SELinux denied reading the lcd_density property
by SurfaceFlinger via qemu_prop and this commit fixes it.
Change-Id: I633d96f4d2ee6659f18482a53e21f816abde2a5f
Signed-off-by: Miroslav Tisma <miroslav.tisma@imgtec.com>
2015-12-11 16:21:00 +01:00
Mike Frysinger
86f12e6dcb
Merge "sepolicy: drop -- marker"
...
am: 50f21eb113
* commit '50f21eb113e533d46d9ccd112cc211070009cabc':
sepolicy: drop -- marker
2015-12-10 10:36:15 -08:00
Mike Frysinger
db4883ca93
sepolicy: drop -- marker
...
It's not needed and is a bit confusing.
BUG=26018537
Change-Id: Ibb1c3995de97a442c95d5eea823523b5f0f26393
2015-12-10 18:18:27 +00:00
Andy Huang
6019adf259
remove Exchange2 from core.mk
...
Change-Id: I962d706d19eef5bbde3abed516d0a674ba50c1c1
2015-12-09 12:21:49 -08:00
Dimitry Ivanov
4a1db8a2a1
Merge "Include libGLESv3.so to PRODUCT_PACKAGES" am: 73661d4220
am: 973decf35c
...
am: fb70c580b1
* commit 'fb70c580b1497a31ff345b36f032241fa55415b2':
Include libGLESv3.so to PRODUCT_PACKAGES
2015-12-08 03:04:34 +00:00
Dimitry Ivanov
fb70c580b1
Merge "Include libGLESv3.so to PRODUCT_PACKAGES" am: 73661d4220
...
am: 973decf35c
* commit '973decf35c2592d6ab9ab5ad9e94e36cd61e0c16':
Include libGLESv3.so to PRODUCT_PACKAGES
2015-12-08 03:01:12 +00:00
Dimitry Ivanov
73661d4220
Merge "Include libGLESv3.so to PRODUCT_PACKAGES"
2015-12-07 19:00:58 +00:00
Chien-Yu Chen
3ee276a009
Merge "Copy video stop sound"
2015-11-30 21:47:55 +00:00
Vince Harron
7bb7263600
Shorten TARGET_BRAND from generic_<arch> to Android am: 5806531f92
am: e13b13c7f6
am: aba12deedb
...
am: 6fe5ec0db2
* commit '6fe5ec0db2ba95d793361399d037d89a684cffb6':
Shorten TARGET_BRAND from generic_<arch> to Android
2015-11-24 23:01:15 +00:00
Vince Harron
6fe5ec0db2
Shorten TARGET_BRAND from generic_<arch> to Android am: 5806531f92
am: e13b13c7f6
...
am: aba12deedb
* commit 'aba12deedb9cdcf8ef01952de1cc51057d8d2bf7':
Shorten TARGET_BRAND from generic_<arch> to Android
2015-11-24 22:57:53 +00:00
Chih-hung Hsieh
f43f558129
Merge "Move mips64 target to clang by default." am: b0d9108795
am: 54ac6cd527
...
am: c5a9f9cbcc
* commit 'c5a9f9cbcc8cbec4a85f0eb25d225f371546833e':
Move mips64 target to clang by default.
2015-11-24 21:25:44 +00:00
Chih-hung Hsieh
fc3277806a
Merge "Move mips target to clang by default." am: 80d6b0a9c6
am: 917f4aea1d
...
am: 7906e14344
* commit '7906e143446ff636b92ba3ee4abc2db1a46f6dee':
Move mips target to clang by default.
2015-11-24 21:25:37 +00:00
Chih-hung Hsieh
b0d9108795
Merge "Move mips64 target to clang by default."
2015-11-24 21:13:38 +00:00
Chih-hung Hsieh
80d6b0a9c6
Merge "Move mips target to clang by default."
2015-11-24 21:13:17 +00:00
Vince Harron
5806531f92
Shorten TARGET_BRAND from generic_<arch> to Android
...
Switching to userdebug emulator images increased ro.build.fingerprint
Past the 91 character limit. This should bring the build server
builds under this limit.
Fixing it for local builds will be a bit more difficult.
Bug: 25829506
Change-Id: I7daee3478716adcb860cced1b770a2d00a72f1a2
(cherry picked from commit efbeab78d3581009b3da20991a3a83d733393f45)
2015-11-24 18:51:59 +00:00
Konstantinos Menychtas
94a47cd03a
Increasing sysimage partition size for all boards
...
This change fixes issue b/25613506
The predefined, fixed system image partition size is failing
to fit content for NYC release MIPS64 images. This change
increases the system image size for all boards to 1.5GB
(up from 1.25GB) to make sure that the system image sizes are
uniform across all virtual boards, and fit new content.
Change-Id: Id9808ad5318cd2390fc666ac35b0f9cd32870993
2015-11-22 17:17:23 -08:00
Chien-Yu Chen
05f47b74f3
Copy video stop sound
...
Bug: 25652382
Change-Id: I72b922a0b3308270a4211700bda7321e1f215c47
2015-11-20 14:00:57 -08:00
Chih-Hung Hsieh
4dcd769f2c
Move mips64 target to clang by default.
...
Bug: 23163853
Change-Id: Ia3d449f908b09ce95b3de246c8c699d171dcbaa3
2015-11-20 13:35:44 -08:00
Chih-Hung Hsieh
990407e0a5
Move mips target to clang by default.
...
Bug: 23163853
Change-Id: I408ffd90ff2ff075e03962fffd1681fccf0319d3
2015-11-20 13:32:22 -08:00
Piotr Jastrzebski
89b94c827f
Use core-oj alongside core-libart wherever required.
...
With some core classes moved to separate core-oj jar
we need to use the new jar.
Change-Id: Ie069c7a93e63b1df854b3137d984b96520562609
2015-11-20 13:53:22 +00:00
Daichi Hirono
3b4f90cfab
Merge "Include MtpDocumentsProvider in the system image."
2015-11-18 23:38:20 +00:00
Dmitriy Ivanov
bb16dcf28e
Include libGLESv3.so to PRODUCT_PACKAGES
...
Bug: http://b/25754041
Change-Id: If5f5030e7e1da037d873f0252dd8beb8ce6fd4db
2015-11-18 15:30:57 -08:00
Ying Wang
14a5e8670d
Merge "Remove unnecessary inheritance layer between aliases." am: 2f05af74bc
am: 10021ac19d
...
am: 1f5de04af7
* commit '1f5de04af7ac7e8b4250dd4fa4bf7c7d8f2f110b':
Remove unnecessary inheritance layer between aliases.
2015-11-18 17:52:32 +00:00
Daichi Hirono
90bf437e7c
Include MtpDocumentsProvider in the system image.
...
BUG=25731385
Change-Id: I9fa90a5c4a0bca3ab7d36968b1e3b40d60d55d31
2015-11-18 13:00:40 +09:00
Ying Wang
cc2001fb44
Remove unnecessary inheritance layer between aliases.
...
The extra inheritance layer may cause multiple
PRODUCT_DEVICE/PRODUCT_BRAND values for a product if it doesn't
explicitly override them, eg. gms.
The full_* are deprecated product names. We keep them just for backward
compatibility, for some tools may still use the full_* product names.
Bug: 25611987
Change-Id: I7ecebd422754c3ceb16507b8d9ced65d533fe7c3
2015-11-16 17:21:42 -08:00
Nicolas Geoffray
3b6db9c4c5
Merge "Make jit the default for all builds."
2015-11-11 08:47:36 +00:00
Griff Hazen
83c07e93c9
Merge "Let qemu_props service set system properties in ro.emu and ro.emulator" am: 0b4529239f
am: 2e4314481e
...
am: 9707c5d724
* commit '9707c5d724d3b6db9cc54156ea099399c1b80f9d':
Let qemu_props service set system properties in ro.emu and ro.emulator
2015-11-08 01:06:15 +00:00
Griff Hazen
0517540e8d
Let qemu_props service set system properties in ro.emu and ro.emulator
...
These boot properties are used by android wear emulator to configure
round and chin shaped devices.
Bug: 23324757
Change-Id: I812da02d771bba0ffc63b14459c7de7cbdeed142
2015-11-07 16:53:59 -08:00
Griff Hazen
20ed978ada
Let qemu_props service set system properties in ro.emu and ro.emulator
...
These boot properties are used by android wear emulator to configure
round and chin shaped devices.
Bug: 23324757
Change-Id: I812da02d771bba0ffc63b14459c7de7cbdeed142
2015-11-07 16:44:54 -08:00
Nicolas Geoffray
56a84e1b6c
Make jit the default for all builds.
...
Change-Id: Ifa4280cdab0747cae8d3e2becec47b230846def6
2015-11-05 18:02:13 +00:00
Jeffrey Vander Stoep
4e5955ea7c
Merge "selinux: Grant all processes the domain_deprecated attribute" am: b18da85cb6
am: 6e32d6b0a0
...
am: 10b3d6cfcb
* commit '10b3d6cfcb357442eefc404c1c83580304f0033a':
selinux: Grant all processes the domain_deprecated attribute
2015-11-04 19:06:04 +00:00
Jeff Vander Stoep
7890fc4d2e
selinux: Grant all processes the domain_deprecated attribute
...
Bug: 25433265
Change-Id: Iafad5abd6e75c5a46f844ef3e744adf1c904b362
2015-11-04 08:49:07 -08:00
Andy Hung
afcf77f54b
Add audioserver executable to base config
...
Bug: 24511453
Change-Id: Ic6575fc8f5a4ab1a75854dc488021d7d06fa1e97
2015-10-30 13:11:30 -07:00
Marco Nelissen
6c5754a93f
Merge "Add extractorservice executable to base config"
2015-10-28 17:30:40 +00:00
Chih-hung Hsieh
d1e932e91e
Merge "Move arm64 target to clang by default." am: befb82f204
am: b7ad8778cd
...
am: 72d90d25d0
* commit '72d90d25d028f62b584cfdaa3c2c7fba68ed74d4':
Move arm64 target to clang by default.
2015-10-28 01:46:34 +00:00
Chih-Hung Hsieh
07be5025d9
resolve merge conflicts of b5775d97b4
to master.
...
Change-Id: I99fda2935ab74e0634c1aa4905ce4da693e96cb6
2015-10-27 16:48:38 -07:00
Chih-hung Hsieh
b7ad8778cd
Merge "Move arm64 target to clang by default."
...
am: befb82f204
* commit 'befb82f20429b469aaebf6c8e7d0a2c4a0d414e3':
Move arm64 target to clang by default.
2015-10-27 23:12:23 +00:00
Chih-hung Hsieh
639ab89a11
Merge "Move arm target to clang by default."
...
am: 873d394c54
* commit '873d394c543e2d0ac96736db77b88e41acb5bc36':
Move arm target to clang by default.
2015-10-27 23:12:13 +00:00
Chih-hung Hsieh
befb82f204
Merge "Move arm64 target to clang by default."
2015-10-27 23:02:26 +00:00
Chih-Hung Hsieh
cf67f13792
Move arm64 target to clang by default.
...
Bug: 23163853
Change-Id: I59c311f552ca060bc7bd034fa4f1c03eb24802d5
2015-10-27 13:44:53 -07:00
Chih-Hung Hsieh
557fa2f3cd
Move arm target to clang by default.
...
Bug: 23163853
Change-Id: I4cb95ed652ca697461e2fb22811779aa2df8d262
2015-10-27 13:42:34 -07:00
Marco Nelissen
469a926e7f
Add extractorservice executable to base config
...
Change-Id: I0ffbe183decfd76be681e08b8627c3d789c4b916
2015-10-27 10:28:00 -07:00
Chih-hung Hsieh
a7404f6f9a
Merge "Move x86_64 target to clang by default." am: 373a1e36a9
am: bbe8225aca
...
am: 8d28df5804
* commit '8d28df58045b6100a70dc605fa0878181cafbfcd':
Move x86_64 target to clang by default.
2015-10-23 00:36:09 +00:00
Chih-hung Hsieh
bbe8225aca
Merge "Move x86_64 target to clang by default."
...
am: 373a1e36a9
* commit '373a1e36a99c7af15a00723c7561db3906281ab5':
Move x86_64 target to clang by default.
2015-10-23 00:30:05 +00:00
Chih-hung Hsieh
373a1e36a9
Merge "Move x86_64 target to clang by default."
2015-10-23 00:26:20 +00:00
Chih-Hung Hsieh
b9774f34e1
Move x86_64 target to clang by default.
...
Bug: 23163853
Change-Id: I0587ec75c0000ac99562233de33147ec8e120e65
2015-10-22 16:29:59 -07:00
Nick Kralevich
d51e641dfe
Merge "allow qemu_props to set opengles.version" am: c5a33b0570
am: c6c5b1a969
...
am: 58ddb6d8e8
* commit '58ddb6d8e8e66e94594a26bbed9679a2bef2a6db':
allow qemu_props to set opengles.version
2015-10-21 18:29:12 +00:00
Nick Kralevich
c6c5b1a969
Merge "allow qemu_props to set opengles.version"
...
am: c5a33b0570
* commit 'c5a33b057071a0c2ea0374bbb28ba02ba2495aba':
allow qemu_props to set opengles.version
2015-10-21 18:19:49 +00:00
Nick Kralevich
ce1062629f
allow qemu_props to set opengles.version
...
Addresses the following denial:
init: avc: denied { set } for property=opengles.version scontext=u:r:qemu_props:s0 tcontext=u:object_r:default_prop:s0 tclass=property_service
Bug: 25148690
Change-Id: I4b197eeabfe37e794104e4e686e9e388b5bc3e0c
2015-10-21 10:55:21 -07:00
Chih-hung Hsieh
8acf4e7ba9
Merge "Move x86 target to clang by default." am: a993bfff36
am: ebfadd8990
...
am: 9b2e93946e
* commit '9b2e93946e20021f75802805d57e3fa56287ee35':
Move x86 target to clang by default.
2015-10-20 23:58:58 +00:00
Chih-hung Hsieh
ebfadd8990
Merge "Move x86 target to clang by default."
...
am: a993bfff36
* commit 'a993bfff361b22902387fc66d734abe385ca3338':
Move x86 target to clang by default.
2015-10-20 20:12:12 +00:00
Chih-Hung Hsieh
f0ba2e9da6
Move x86 target to clang by default.
...
Bug: 23163853
Change-Id: Ib5e9beddbeca8968d6e4365abeb44ae97cbe9981
2015-10-20 12:16:57 -07:00
Sami Tolvanen
a749f91191
am 6a14ba31: am 58a748d3: am 87f58261: Merge "Error correction: Append codes to verified partitions"
...
* commit '6a14ba317cea22f16db3bb76cb818fd7322b8253':
Error correction: Append codes to verified partitions
2015-10-19 10:07:21 +00:00
Sami Tolvanen
58a748d37e
am 87f58261: Merge "Error correction: Append codes to verified partitions"
...
* commit '87f582611a5a5c23abf3237abe0e467e46111567':
Error correction: Append codes to verified partitions
2015-10-19 02:55:51 -07:00
Sami Tolvanen
87f582611a
Merge "Error correction: Append codes to verified partitions"
2015-10-19 09:49:18 +00:00
Ying Wang
a731c7b466
am 7fffc3d0: am 5eb1f1fb: am f1b066b5: Merge "Remove duplicate local_time.default"
...
* commit '7fffc3d0d0ed74c4b5b75a765483c89912089098':
Remove duplicate local_time.default
2015-10-15 18:50:02 +00:00
Ying Wang
5eb1f1fbf1
am f1b066b5: Merge "Remove duplicate local_time.default"
...
* commit 'f1b066b5ce3ebec905cb38dbb48a77dc58d4c457':
Remove duplicate local_time.default
2015-10-15 18:39:45 +00:00
Ying Wang
f1b066b5ce
Merge "Remove duplicate local_time.default"
2015-10-15 18:35:26 +00:00
Nick Kralevich
c98da6590a
am ee15a452: am f14b0298: am 5c24a50e: Merge "generic_x86: delete system_server execmem"
...
* commit 'ee15a4527e2ee495141a06774e332cb3c0c61fc4':
generic_x86: delete system_server execmem
2015-10-15 09:55:15 +00:00
Nick Kralevich
f14b0298f6
am 5c24a50e: Merge "generic_x86: delete system_server execmem"
...
* commit '5c24a50e5fba6aad3319edc0770005e20ac0b9e1':
generic_x86: delete system_server execmem
2015-10-15 09:46:45 +00:00
Nick Kralevich
7da1b68236
generic_x86: delete system_server execmem
...
https://android-review.googlesource.com/175922 removed all uses
of system_server execmem and neverallowed it. The x86 emulator policy
inappropriately includes this rule. Delete it.
Fixes the following build breakage:
libsepol.report_failure: neverallow on line 473 of external/sepolicy/system_server.te (or line 12452 of policy.conf) violated by allow system_server system_server:process { execmem };
libsepol.check_assertions: 1 neverallow failures occurred
Error while expanding policy
Change-Id: I7fbfaa0a09e8f4e8a372d2f1a64bbe58d5302204
2015-10-15 02:37:40 -07:00
Sami Tolvanen
99fe05567b
am f635a586: Merge "Disable verity metadata for eng builds"
...
* commit 'f635a586e8f4790455ef3dad8c1291c9eb95747e':
Disable verity metadata for eng builds
2015-10-14 20:53:28 +00:00
Sami Tolvanen
f99b53143d
Error correction: Append codes to verified partitions
...
Append error-correcting codes to verified partitions provided that
PRODUCT_SUPPORTS_VERITY_FEC is true.
This moves verity metadata to be after the hash tree, and requires
matching changes from
Ide48f581bbba77aed6132f77b309db71630d81ed
Bug: 21893453
Change-Id: I6945cbab99e214566a1f9d3702333f2dbbc35816
2015-10-14 18:06:20 +01:00
Sami Tolvanen
58fbd69729
Disable verity metadata for eng builds
...
We don't have dm-verity enabled on eng builds, so don't waste time
generating metadata for images.
Change-Id: Ib2c8d459bb50c30dc32a4ea1fdedc152c09a3a0f
(cherry picked from commit beae6395fc
)
2015-10-14 18:03:29 +01:00
Hans Boehm
8638de1f6f
am ab4d8594: Switch from Calculator to ExactCalculator
...
* commit 'ab4d8594591b715934d7a1106d5284e9721070ba':
Switch from Calculator to ExactCalculator
2015-10-13 03:49:41 +00:00
Hans Boehm
ab4d859459
Switch from Calculator to ExactCalculator
...
Bug: 24875598
Use ExactCalculator for AOSP builds.
This is a manual (due to intervening commits) cherrypick of
commit 53c5891460
(ag/748830).
Change-Id: I6c0acef640e62f8a70b7b2832b7eea662a0d301b
2015-10-12 17:08:04 -07:00
Dianne Hackborn
30c197eeaf
Include the new "cmd" command-line tool in all Android builds.
...
Change-Id: I93f415ddde0f4e273be04af3379ee706962416d2
2015-10-12 10:39:04 -07:00
Chih-Wei Huang
7fa65eec72
Remove duplicate local_time.default
...
Seems it's copied from target/product/generic_no_telephony.mk
which had duplicate local_time.default before.
(fixed in commit 567ea28838
)
Change-Id: I09dcdffc14de08b3d25a5fd08364d38b2712bb08
2015-10-08 15:07:23 +08:00
Ying Wang
b1bee75f79
am 3d6e194e: am 393c6254: Really include drawables for all densities.
...
* commit '3d6e194eafbb441c79d4cd306af85eeb34fb75e8':
Really include drawables for all densities.
2015-09-29 18:13:03 +00:00
Ying Wang
3d6e194eaf
am 393c6254: Really include drawables for all densities.
...
* commit '393c62549a6340b3473f14b71d583e118d7e6a6d':
Really include drawables for all densities.
2015-09-29 18:07:41 +00:00
Ying Wang
393c62549a
Really include drawables for all densities.
...
Previously with "PRODUCT_AAPT_CONFIG := normal" resource with modifier
"small" isn't included.
Bug: 21643610
Change-Id: I53940d716fb9705462b1abb882e04103e211f8af
2015-09-29 09:57:41 -07:00
David Turner
ad52d27ba7
am efae8b10: am 6af93636: am c6444855: Merge "GPU: add gralloc.ranchu library"
...
* commit 'efae8b1003cb06cd0d05c8fc4017715dd40ea3f6':
GPU: add gralloc.ranchu library
2015-09-25 17:21:26 +00:00
David Turner
efae8b1003
am 6af93636: am c6444855: Merge "GPU: add gralloc.ranchu library"
...
* commit '6af936361bbfb23042d7a7cecb3034d4f25795a0':
GPU: add gralloc.ranchu library
2015-09-25 17:13:20 +00:00
David Turner
6af936361b
am c6444855: Merge "GPU: add gralloc.ranchu library"
...
* commit 'c64448550a5148489346f7ba3ac0a686b32dbc26':
GPU: add gralloc.ranchu library
2015-09-25 17:06:22 +00:00
David Turner
c64448550a
Merge "GPU: add gralloc.ranchu library"
2015-09-25 16:59:31 +00:00
Miroslav Tisma
173615ddee
GPU: add gralloc.ranchu library
...
Change-Id: I76b21f67e081d82ec76242c051569f32b2b6b638
2015-09-24 21:04:24 +02:00
Stephen Hines
bd264342a0
am 527b6255: am 4a9e0c8c: am 17a41e36: Merge "Add ld.mc as a requirement for core_tiny.mk as well."
...
* commit '527b6255ccd0e41ca8bbdfcf97121c67c0074280':
Add ld.mc as a requirement for core_tiny.mk as well.
2015-09-22 22:22:23 +00:00
Stephen Hines
527b6255cc
am 4a9e0c8c: am 17a41e36: Merge "Add ld.mc as a requirement for core_tiny.mk as well."
...
* commit '4a9e0c8cc5c15505bfbd6ed03ff6b8855af64420':
Add ld.mc as a requirement for core_tiny.mk as well.
2015-09-22 22:14:30 +00:00
Stephen Hines
4a9e0c8cc5
am 17a41e36: Merge "Add ld.mc as a requirement for core_tiny.mk as well."
...
* commit '17a41e36dbe75b94bde05a1c511903ae2162aea8':
Add ld.mc as a requirement for core_tiny.mk as well.
2015-09-22 22:06:34 +00:00
Stephen Hines
5e70468657
Add ld.mc as a requirement for core_tiny.mk as well.
...
Bug: 24171451
I missed this when I initially added ld.mc as a requirement for
core_minimal.mk. This is required for RenderScript linking on the
device.
Change-Id: Ie3ffa2454214f886c38387f45b34df2dcbebd6e6
(cherry picked from commit 446ae75fb7
)
2015-09-22 12:54:54 -07:00
Stephen Hines
446ae75fb7
Add ld.mc as a requirement for core_tiny.mk as well.
...
Bug: 24171451
I missed this when I initially added ld.mc as a requirement for
core_minimal.mk. This is required for RenderScript linking on the
device.
Change-Id: Ie3ffa2454214f886c38387f45b34df2dcbebd6e6
2015-09-22 12:49:39 -07:00
Bo Hu
87d44ceccd
am 6321e831: am 6d98051a: am 8cb586a5: am ca352f36: am 2ad5c0cc: Merge "emulator.mk: Add ethernet permission" into mnc-dev
...
* commit '6321e831bb0d9f78c300b1c5cdf4871f31ff3949':
emulator.mk: Add ethernet permission
2015-09-16 18:12:35 +00:00
Bo Hu
6321e831bb
am 6d98051a: am 8cb586a5: am ca352f36: am 2ad5c0cc: Merge "emulator.mk: Add ethernet permission" into mnc-dev
...
* commit '6d98051a8fab8ba37e661b746f024907b2425be4':
emulator.mk: Add ethernet permission
2015-09-16 18:05:15 +00:00
Bo Hu
ca352f3623
am 2ad5c0cc: Merge "emulator.mk: Add ethernet permission" into mnc-dev
...
* commit '2ad5c0cca46b7f0a159dbc90243756c84a93b093':
emulator.mk: Add ethernet permission
2015-09-16 17:45:59 +00:00
Sami Tolvanen
beae6395fc
Disable verity metadata for eng builds
...
We don't have dm-verity enabled on eng builds, so don't waste time
generating metadata for images.
Change-Id: Ib2c8d459bb50c30dc32a4ea1fdedc152c09a3a0f
2015-09-16 15:12:39 +01:00
bohu
9ee993f60e
emulator.mk: Add ethernet permission
...
Networking on old emulator device(a.k.a. goldfish) relies on RIL;
However, RIL is not available on ranchu device yet. For ranchu device
to have a functional networking, we need to add ethernet permission
and start dhcpcd_eth0 service on ranchu device. This CL adds ethernet
permission to both goldfish (which is harmless) and ranchu devices.
This addition was originally proposed by miroslav.tisma@imgtec.com
and the ethernet permission was only added to arm64 and mips64 after
discussion. With the ranchu device supporting more architectures,
it makes sense to allow this permission on all devices and all CPU
architectures.
related CL by miroslav.tisma@imgtec.com on AOSP:
b09fb84becf73bf2bc578ebf27910d75b79d668a
bug: 24070972
Change-Id: I81ac5d8901adee43784fe9dd45a170fb90bb824a
2015-09-14 16:40:12 -07:00
Tom Cherry
341bb905e2
am 844079e0: resolved conflicts for merge of b8b53534
to mnc-dr-dev-plus-aosp
...
* commit '844079e0f28420fa463ac8913332c4e8a5101f34':
move init.trace.rc to frameworks/native
2015-09-03 22:31:49 +00:00
Tom Cherry
844079e0f2
resolved conflicts for merge of b8b53534
to mnc-dr-dev-plus-aosp
...
Change-Id: I72caaa4aaf9ec78abb83e9d9b3ced535ab3f7c04
2015-09-03 15:20:51 -07:00
Tom Cherry
b8b535349a
am 62062c9d: Merge "move init.trace.rc to frameworks/native"
...
* commit '62062c9d66e38ad404d93e963c1341fa4b7090fe':
move init.trace.rc to frameworks/native
2015-09-03 22:02:38 +00:00
Tom Cherry
05bd7f3499
move init.trace.rc to frameworks/native
...
init.trace.rc will be renamed to atrace.rc and use the LOCAL_INIT_RC
mechanism to be included on /system appropriately.
Bug 23186545
Change-Id: Ibb86761d3e8d3c6d194ddb1220f93a71a8c6675b
2015-09-03 14:20:43 -07:00
Badhri Jagan Sridharan
d926d4bd60
am 74415b3b: am 28dd99d8: am a0eb142a: am dfea066f: Merge "Include init.usb.configfs.rc into rootdir" into mnc-dr-dev
...
* commit '74415b3b6d3969374e3062154cb0fd10066e9837':
Include init.usb.configfs.rc into rootdir
2015-09-03 04:34:38 +00:00
Badhri Jagan Sridharan
74415b3b6d
am 28dd99d8: am a0eb142a: am dfea066f: Merge "Include init.usb.configfs.rc into rootdir" into mnc-dr-dev
...
* commit '28dd99d8eacb5b1baf4f16a07472de8bbd9d5100':
Include init.usb.configfs.rc into rootdir
2015-09-03 04:23:00 +00:00
Badhri Jagan Sridharan
a8a4a93733
Include init.usb.configfs.rc into rootdir
...
Bug=23633457
Change-Id: I26bbc5ff597138b2ccac1de72117753739b31554
2015-09-01 22:43:42 +00:00
Richard Uhler
bf8ad93d0b
am 5d463ff9: am 7086e113: am e4c753f4: Merge "Add ahat to runtime_libart product."
...
* commit '5d463ff9ceecb3a2dbc565e33fbbff3c4e60198b':
Add ahat to runtime_libart product.
2015-09-01 17:04:30 +00:00
Richard Uhler
5d463ff9ce
am 7086e113: am e4c753f4: Merge "Add ahat to runtime_libart product."
...
* commit '7086e1136a898caa0316002419eb9961f554459e':
Add ahat to runtime_libart product.
2015-09-01 16:43:48 +00:00
Richard Uhler
7086e1136a
am e4c753f4: Merge "Add ahat to runtime_libart product."
...
* commit 'e4c753f428ff404f10ec1bf170ea18ed2687dc07':
Add ahat to runtime_libart product.
2015-09-01 16:36:23 +00:00
Richard Uhler
7324f30a4f
Add ahat to runtime_libart product.
...
Change-Id: Iae5837f884c926a9f0e57df56bd21b6260ee8b2d
2015-08-28 16:30:17 -07:00
Nick Kralevich
5758846abe
am e7fb896d: am 35a075db: am 36d91b53: Merge "Only allow toolbox exec where /system exec was already allowed."
...
* commit 'e7fb896df309953d010f3c3923b7ed83505cd12b':
Only allow toolbox exec where /system exec was already allowed.
2015-08-26 03:00:03 +00:00
Nick Kralevich
e7fb896df3
am 35a075db: am 36d91b53: Merge "Only allow toolbox exec where /system exec was already allowed."
...
* commit '35a075db60bc5553b57ef3311b9643d3b04ea7da':
Only allow toolbox exec where /system exec was already allowed.
2015-08-26 02:54:08 +00:00
Nick Kralevich
64e4d8a211
am 35a075db: am 36d91b53: Merge "Only allow toolbox exec where /system exec was already allowed."
...
* commit '35a075db60bc5553b57ef3311b9643d3b04ea7da':
Only allow toolbox exec where /system exec was already allowed.
2015-08-25 22:53:03 +00:00
Stephen Smalley
75770de701
Only allow toolbox exec where /system exec was already allowed.
...
When the toolbox domain was introduced, we allowed all domains to exec it
to avoid breakage. However, only domains that were previously allowed the
ability to exec /system files would have been able to do this prior to the
introduction of the toolbox domain. Remove the rule from domain.te and add
rules to all domains that are already allowed execute_no_trans to system_file.
Requires coordination with device-specific policy changes with the same Change-Id.
Change-Id: Ie46209f0412f9914857dc3d7c6b0917b7031aae5
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2015-08-25 11:46:12 -04:00
Konstantinos Menychtas
2bbb6aa343
am 25067c4d: am 3337d1eb: am 58aacccb: am 39b32b0d: am 956e4693: Increasing MIPS emulator system image size and user-data image size
...
* commit '25067c4dc379e96538e7c551ad5d094197765931':
Increasing MIPS emulator system image size and user-data image size
2015-08-19 02:21:12 +00:00
Konstantinos Menychtas
25067c4dc3
am 3337d1eb: am 58aacccb: am 39b32b0d: am 956e4693: Increasing MIPS emulator system image size and user-data image size
...
* commit '3337d1eb298516a4dd8b43fdc4b00dcde29f3c32':
Increasing MIPS emulator system image size and user-data image size
2015-08-19 01:42:32 +00:00
Konstantinos Menychtas
8694cf75b6
am 956e4693: Increasing MIPS emulator system image size and user-data image size
...
* commit '956e469327b1da4b635f20795ed48f6c36ba10d6':
Increasing MIPS emulator system image size and user-data image size
2015-08-19 01:40:09 +00:00
Konstantinos Menychtas
39b32b0d1f
am 956e4693: Increasing MIPS emulator system image size and user-data image size
...
* commit '956e469327b1da4b635f20795ed48f6c36ba10d6':
Increasing MIPS emulator system image size and user-data image size
2015-08-18 18:28:45 +00:00
Konstantinos Menychtas
956e469327
Increasing MIPS emulator system image size and user-data image size
...
Size increase taken as a precaution against recent built breakage
due to lack of space on a number of targets (e.g. x86, ARM64).
System and user-data image sizes set to match currently most common
setup for the emulator: system image: 1.25gb, user-data image 700mb.
Change-Id: I7118eb26dd78f5fa9e4f0006e15c8d47dee8e28c
2015-08-18 17:34:09 +00:00
Justin Klaassen
fdb22ae470
am ae71306a: Merge "Revert "Revert "Switch from Calculator to ExactCalculator""" into mnc-dr-dev-plus-aosp
...
* commit 'ae71306af68ab60a3e006deb8e4a0f48c3d43ea5':
Revert "Revert "Switch from Calculator to ExactCalculator""
2015-08-17 18:43:27 +00:00
Justin Klaassen
45249ff5d1
Revert "Revert "Switch from Calculator to ExactCalculator""
...
This reverts commit 455ffaafcd
.
Bug: 23186109
Change-Id: If768c4c85b8dbf1ffe881eca3412d92150fb019f
2015-08-13 19:22:06 +00:00
Justin Klaassen
53c5891460
Revert "Revert "Switch from Calculator to ExactCalculator""
...
This reverts commit 455ffaafcd
.
Bug: 23186109
Change-Id: If768c4c85b8dbf1ffe881eca3412d92150fb019f
2015-08-13 12:19:38 -07:00
Mike Dodd
0477cbe63d
am 742463b3: am 689c097e: am 148839b2: am 17b06910: am 5bf35d06: Merge "Include new AOSP messaging app in base AOSP telephony builds." into mnc-dev
...
* commit '742463b30fb0f45bd43bf8e0c1c799c9bee35303':
Include new AOSP messaging app in base AOSP telephony builds.
2015-08-13 15:50:24 +00:00
Mike Dodd
742463b30f
am 689c097e: am 148839b2: am 17b06910: am 5bf35d06: Merge "Include new AOSP messaging app in base AOSP telephony builds." into mnc-dev
...
* commit '689c097eb3ad838f18fd13493cc0d73260f1137e':
Include new AOSP messaging app in base AOSP telephony builds.
2015-08-13 15:43:39 +00:00
Mike Dodd
17b0691076
am 5bf35d06: Merge "Include new AOSP messaging app in base AOSP telephony builds." into mnc-dev
...
* commit '5bf35d0685ba62ded55cc63f3dd2f23b82cc645d':
Include new AOSP messaging app in base AOSP telephony builds.
2015-08-13 15:22:44 +00:00
Mike Dodd
44af8f9655
am 5bf35d06: Merge "Include new AOSP messaging app in base AOSP telephony builds." into mnc-dev
...
* commit '5bf35d0685ba62ded55cc63f3dd2f23b82cc645d':
Include new AOSP messaging app in base AOSP telephony builds.
2015-08-13 15:21:46 +00:00
Nick Kralevich
0933e17bb6
am cd8f838d: am c85364c9: am 5f79bcdd: Merge changes from topic \'file_contexts.bin\'
...
* commit 'cd8f838d079b38d8c125396f7932c4be24063193':
build: switch over to file_contexts.bin only
Update embedded.mk to support file_contexts.bin
2015-08-13 00:10:36 +00:00
Nick Kralevich
cd8f838d07
am c85364c9: am 5f79bcdd: Merge changes from topic \'file_contexts.bin\'
...
* commit 'c85364c9c91961461a6d81a37c8b30b34b02383b':
build: switch over to file_contexts.bin only
Update embedded.mk to support file_contexts.bin
2015-08-13 00:01:09 +00:00
Nick Kralevich
420662b9cd
am c85364c9: am 5f79bcdd: Merge changes from topic \'file_contexts.bin\'
...
* commit 'c85364c9c91961461a6d81a37c8b30b34b02383b':
build: switch over to file_contexts.bin only
Update embedded.mk to support file_contexts.bin
2015-08-13 00:00:36 +00:00
Nick Kralevich
5f79bcdd07
Merge changes from topic 'file_contexts.bin'
...
* changes:
build: switch over to file_contexts.bin only
Update embedded.mk to support file_contexts.bin
2015-08-12 23:46:28 +00:00
Mike Dodd
f29b5bd380
Include new AOSP messaging app in base AOSP telephony builds.
...
b/23110861
Change-Id: I31ba32f3341c77ba6eb083a189dffa1a08c6c8d4
2015-08-12 15:44:04 -07:00
Ian Pedowitz
01090a42ef
am 28c3907d: am 35bdf149: am 7e8d6f25: am 0fd879cd: am a0372e20: Merge "Removing VisualizationWallpapers as it does not comply with API 23 rules" into mnc-dev
...
* commit '28c3907d695786f19b6e1e8b96d4484b28a4a79b':
Removing VisualizationWallpapers as it does not comply with API 23 rules
2015-08-12 20:56:34 +00:00
Ian Pedowitz
28c3907d69
am 35bdf149: am 7e8d6f25: am 0fd879cd: am a0372e20: Merge "Removing VisualizationWallpapers as it does not comply with API 23 rules" into mnc-dev
...
* commit '35bdf149e7deeea5eebb61ebd3e64261f5eb506d':
Removing VisualizationWallpapers as it does not comply with API 23 rules
2015-08-12 20:49:10 +00:00
Ian Pedowitz
0fd879cd65
am a0372e20: Merge "Removing VisualizationWallpapers as it does not comply with API 23 rules" into mnc-dev
...
* commit 'a0372e20a24283002c2d27b372194d88e1983a3f':
Removing VisualizationWallpapers as it does not comply with API 23 rules
2015-08-12 20:17:30 +00:00
Ian Pedowitz
3584355bb9
am a0372e20: Merge "Removing VisualizationWallpapers as it does not comply with API 23 rules" into mnc-dev
...
* commit 'a0372e20a24283002c2d27b372194d88e1983a3f':
Removing VisualizationWallpapers as it does not comply with API 23 rules
2015-08-12 19:51:22 +00:00
Mike Dodd
a1e7e8a5f6
am 97bb3986: am e4f29f0b: am 00e15cd5: am 09baf014: am 745d11cc: Merge "Revert "Include new AOSP messaging app in base builds."" into mnc-dev
...
* commit '97bb3986f5ed7cb0adaf4fbd9a7ce5ad926d4fcf':
Revert "Include new AOSP messaging app in base builds."
2015-08-12 19:48:55 +00:00
Ian Pedowitz
a0372e20a2
Merge "Removing VisualizationWallpapers as it does not comply with API 23 rules" into mnc-dev
2015-08-12 19:41:54 +00:00
Mike Dodd
97bb3986f5
am e4f29f0b: am 00e15cd5: am 09baf014: am 745d11cc: Merge "Revert "Include new AOSP messaging app in base builds."" into mnc-dev
...
* commit 'e4f29f0bb76a2f581714c082270cee7964d7004e':
Revert "Include new AOSP messaging app in base builds."
2015-08-12 19:18:16 +00:00
Mike Dodd
09baf01491
am 745d11cc: Merge "Revert "Include new AOSP messaging app in base builds."" into mnc-dev
...
* commit '745d11ccd077060b5d3b0e3e53682e8c1f85dd66':
Revert "Include new AOSP messaging app in base builds."
2015-08-12 18:58:59 +00:00