Yin-Chia Yeh
39f1d88038
Merge "Revert "Revert "Camera: add NDK camera library"""
2016-01-27 00:14:43 +00:00
Yin-Chia Yeh
821375c718
Revert "Revert "Camera: add NDK camera library""
...
This reverts commit e4329eb24f
.
Change-Id: I414845a9e12148499db46a2c1b083d65175dea09
2016-01-27 00:13:51 +00:00
Kevin Cernekee
27498f2e39
Merge "README: Update docs" am: 30177c45b4
...
am: 753536092c
* commit '753536092c2cde7e959bdcaef9c45207351e9a18':
README: Update docs
2016-01-26 23:53:34 +00:00
Kevin Cernekee
753536092c
Merge "README: Update docs"
...
am: 30177c45b4
* commit '30177c45b4e61ae11749bf9106c64d1b1e2ae517':
README: Update docs
2016-01-26 23:51:39 +00:00
Kevin Cernekee
30177c45b4
Merge "README: Update docs"
2016-01-26 23:45:37 +00:00
Yin-Chia Yeh
6f138d7eac
Merge "Revert "Camera: add NDK camera library""
2016-01-26 23:44:15 +00:00
Yin-Chia Yeh
e4329eb24f
Revert "Camera: add NDK camera library"
...
This reverts commit 153005787d
.
Breaking seed/andromeda build now. Investigating.
Change-Id: Id0884cc8b126694c9142d7771dc2187b10fdd415
2016-01-26 23:42:43 +00:00
Yin-Chia Yeh
c6eedaff72
Merge "Camera: add NDK camera library"
2016-01-26 22:30:08 +00:00
Yin-Chia Yeh
153005787d
Camera: add NDK camera library
...
Bug: 23012001
Change-Id: I19b9d4c7a83f3baaf5e6102c5f0b7876546fe95d
2016-01-25 14:48:10 -08:00
Christopher Ferris
07b0a0da9f
Merge "Add libc_malloc_debug to the always build list." am: 4d15f2f8c9
...
am: 093ca195bd
* commit '093ca195bd6a3e21c11ad04553b3fe5c6447ea97':
Add libc_malloc_debug to the always build list.
2016-01-25 21:33:46 +00:00
Christopher Ferris
093ca195bd
Merge "Add libc_malloc_debug to the always build list."
...
am: 4d15f2f8c9
* commit '4d15f2f8c9adc463c6e904667b9793a3f3544ef4':
Add libc_malloc_debug to the always build list.
2016-01-25 21:31:54 +00:00
Christopher Ferris
4d15f2f8c9
Merge "Add libc_malloc_debug to the always build list."
2016-01-25 21:27:57 +00:00
Alex Klyubin
24b1c64c5b
resolve merge conflicts of bb3d77ba95
to master.
...
Change-Id: Ib69e2a457c416b4da94fb76c231120632d47a07a
2016-01-22 11:05:03 -08:00
James Hawkins
bb3d77ba95
Merge "bootstat: Add bootstat to the embedded target to support logging boot time across devices."
...
am: cb9da42c87
* commit 'cb9da42c878f5afb32513b441eaf72868163b655':
bootstat: Add bootstat to the embedded target to support logging boot time across devices.
2016-01-22 18:28:19 +00:00
James Hawkins
bc5dc64232
bootstat: Add bootstat to the embedded target to support logging boot
...
time across devices.
Bug: 21724738
Change-Id: I165e8597103ea235a0826e321a1658823c4b4664
2016-01-21 15:39:45 -08:00
Calin Juravle
388bae1ca3
Merge "Enable the use of jit profiles"
2016-01-20 22:31:37 +00:00
Makoto Onuki
00003c38b3
Add BlockedNumberProvider to core.mk
...
Bug 26232372
Change-Id: I4e77588587d75dcb110caef8d76b64bb396ca052
2016-01-14 11:31:27 -08:00
Andy Huang
b7da60c2fa
Merge "remove Exchange2 from core.mk" into mnc-dr1.5-dev am: 0936632c93
am: 624ecb988b
...
am: 400d9ff4ba
* commit '400d9ff4ba0a606d5bf1f7c29cb2d61f3de4b4cc':
remove Exchange2 from core.mk
2016-01-13 23:42:59 +00:00
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
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
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
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
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
Andy Hung
04aa83cfb4
Merge "Add audioserver executable to base config"
2015-12-11 20:08:51 +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
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
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
Chien-Yu Chen
05f47b74f3
Copy video stop sound
...
Bug: 25652382
Change-Id: I72b922a0b3308270a4211700bda7321e1f215c47
2015-11-20 14:00:57 -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
56a84e1b6c
Make jit the default for all builds.
...
Change-Id: Ifa4280cdab0747cae8d3e2becec47b230846def6
2015-11-05 18:02:13 +00: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
469a926e7f
Add extractorservice executable to base config
...
Change-Id: I0ffbe183decfd76be681e08b8627c3d789c4b916
2015-10-27 10:28:00 -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