OSDN Git Service
Marco Nelissen [Wed, 21 Jun 2017 17:38:51 +0000 (17:38 +0000)]
Merge "Fix tiny memory leak"
Treehugger Robot [Tue, 20 Jun 2017 00:21:43 +0000 (00:21 +0000)]
Merge changes from topic 'vendor_available_libeffects'
* changes:
Change libeffect from vendor:true to vendor_available:true
Add libeffects_headers.
libeffects: move to vendor
Treehugger Robot [Tue, 20 Jun 2017 00:20:58 +0000 (00:20 +0000)]
Merge changes Iabcb5469,Id8302f88,Iadfa594e,If0b10ed9
* changes:
Add libhardware_headers to various modules
libdrmclearkeyplugin is linked against libstagefright_foundation_vendor
provide libstagefright_foundation_vendor to vendors
Move libstagefright headers to media/libstagefright/include
Jiyong Park [Wed, 14 Jun 2017 10:53:14 +0000 (19:53 +0900)]
Change libeffect from vendor:true to vendor_available:true
libaudioflinger is still using the lib in the aosp/master branch.
Bug:
33241851
Test: BOARD_VNDK_VERSION=current m -j
Merged-In: I11b54a5f050f914afc234e15f680581d15064c82
Change-Id: I9808ea87ea037a3caef03b2beabd1a717f153a6d
Steven Moreland [Mon, 17 Apr 2017 22:42:49 +0000 (15:42 -0700)]
Add libeffects_headers.
Also had to fix the location and symlink of them.
Test: works with BOARD_VNDK_VERSION := current
Bug:
33241851
Merged-In: Idcfe1eaaf7be10a183b69bafa07f035ab9ca1e4e
Change-Id: Idcfe1eaaf7be10a183b69bafa07f035ab9ca1e4e
(cherry picked from commit
a3b4ef8b5f99e3161684bb56b1e77f94903e194a)
Steven Moreland [Fri, 14 Apr 2017 00:55:29 +0000 (17:55 -0700)]
libeffects: move to vendor
Bug:
33241851
Test: equalizer works in google play music
Test: CleanSpec works
Merged-Id: I11b54a5f050f914afc234e15f680581d15064c82
Change-Id: I11b54a5f050f914afc234e15f680581d15064c82
(cherry picked from commit
c2e0f33032b223013645d8d0838abd9b00197318)
Vijay Venkatraman [Thu, 1 Jun 2017 21:07:20 +0000 (14:07 -0700)]
Add libhardware_headers to various modules
Bug:
33241851
Test: build target and pass CTS
Test: With BOARD_VNDK_VERSION, mma works
Merged-In: Iabcb5469c4fd936c2d7c1f9a1113c557c8beab88
Change-Id: Iabcb5469c4fd936c2d7c1f9a1113c557c8beab88
(cherry picked from commit
da6a063a9ec520373443cdd4796eb643fcbffe34)
Jiyong Park [Fri, 26 May 2017 02:45:08 +0000 (11:45 +0900)]
libdrmclearkeyplugin is linked against libstagefright_foundation_vendor
Since libdrmclearkeyplugin is in vendor partition, it is linked against
the vendor-variant of the libstagefright_foundation.
Bug:
37343126
Test: sailfish builds and boots
Test: BOARD_VNDK_CURRENT=current m libdrmclearkeyplugin is successful
Merged-In: Id8302f88978fc91282c54e0a679bcd8978898f8d
Change-Id: Id8302f88978fc91282c54e0a679bcd8978898f8d
(cherry picked from commit
24aa2adf677c71cc8f3c519ce83f4cf3363e640f)
Jiyong Park [Thu, 27 Apr 2017 08:32:00 +0000 (17:32 +0900)]
provide libstagefright_foundation_vendor to vendors
libstagefright_foundation_vendor is a vendor-only variant of the
libstagefright_foundation. Vendor libs and other VNDK libs should link
against this _vendor.so library. This vendor-only variant does not have
dependency to libpowermanager which is not available to vendors.
Headers are moved from the global include dir to module-local include
dir. This is because global include dir (e.g. frameworks/av/include) is
not provided when building with BOARD_VNDK_VERSION=current. Instead the
headers are exported via the module's export_include_dirs directive.
Short summary on the directory movement:
"some" libstagefright headers are moved from libstagefright/include to
libstagefright/include/media/stagefright. This is because the headers
are included as <media/stagefright/HEADER_NAME,h>.
libstagefrigut_foundation headers are moved from
libstagefright/include/foundation to
libstagefright/foundation/include/media/stagefright/foundation. Again
this is because the headers are included as
<media/stagefright/foundation/HEADER_NAME.h>.
Furthermore, in order to prevent sudden breakage, symlinks to the
module-local header directories are added to the global include
directory.
frameworks/av/include/media/stagefright ->
<libstagefright>/include/media/stagefright
frameworks/av/include/media/stagefright/foundation ->
<libstagefright_foundation>/include/media/stagefright/foundation
Bug:
37462569
Test: sailfish builds and boots
Test: BOARD_VNDK_VERSION=current m libstagefright_foundation_vendor is
successful
Merged-Id: Iadfa594e885e0bd39837ccb282993d3ba5b62852
Change-Id: Iadfa594e885e0bd39837ccb282993d3ba5b62852
(cherry picked from commit
093f0b7ab981049e7a6e6bbcf1e0712e1995ba68)
Jiyong Park [Wed, 14 Jun 2017 08:36:04 +0000 (17:36 +0900)]
Move libstagefright headers to media/libstagefright/include
This is a backport of the libstagefright portion of the change to move
headers from include/ into the appropriate directories.
include/media/stagefright -> media/libstagefright/include
Adds a symlink from the old location to the new one.
Bug:
33241851
Test: mmma -j frameworks/av/media/libstagefright
Merged-In: I0ecf754a2132640ae781a3cc31428fb8c0bd1669
Change-Id: If0b10ed98e06a068985cf8d84a089e539a7cde5f
Treehugger Robot [Tue, 13 Jun 2017 20:35:31 +0000 (20:35 +0000)]
Merge "fix potential mediaserver crash in ACodec::getPortFormat"
Treehugger Robot [Mon, 12 Jun 2017 21:59:23 +0000 (21:59 +0000)]
Merge "libmedia: Improve charset detection."
caozhiyuan [Fri, 5 May 2017 05:53:33 +0000 (13:53 +0800)]
libmedia: Improve charset detection.
Tags are first put together before being detected. When different tags
are encoded in different charset, the result could be very bad. So when
the best result is not good enough, we should not accept it. We give it
another chance by detecting tags separately.
For the test samples we collected, 6 songs out of 13 are now displayed
correctly.
Test: transfer mp3 to devices and see if the tags' charsets are detected
correctly.
Signed-off-by: caozhiyuan <cao.zhiyuan@zte.com.cn>
Change-Id: I90d11a612b9f9e8896696df85635c4a46d067f09
panshuangquan [Thu, 8 Jun 2017 02:00:11 +0000 (10:00 +0800)]
fix potential mediaserver crash in ACodec::getPortFormat
https://issuetracker.google.com/issues/
62428782
if rect.nLeft or rect.nTop is less then 0, in the error log it
will still check the integer overflow which probably cause abort
Test: NA
Change-Id: Ibe9a6edd0a57267b8dc7a29cdbdb2645e44c9af7
Signed-off-by: panshuangquan <panshuangquan@xiaomi.com>
Chih-hung Hsieh [Thu, 8 Jun 2017 20:24:11 +0000 (20:24 +0000)]
Merge "Add OWNERS in frameworks/av"
Marco Nelissen [Wed, 7 Jun 2017 20:39:40 +0000 (13:39 -0700)]
Fix tiny memory leak
Bug:
36103283
Change-Id: Ib33905fc64b997da80b4b26346db7c531ff8bb8e
Chih-Hung Hsieh [Mon, 5 Jun 2017 22:45:46 +0000 (15:45 -0700)]
Add OWNERS in frameworks/av
* Owners are selected from top CL approvals or owners.
They will be suggested to review/approve future CLs.
* OWNERS files are recognized by the new find-owners plugin, see .md files in
https://gerrit.googlesource.com/plugins/find-owners/+/master/src/main/resources/Documentation/
Test: build/make/tools/checkowners.py -c -v OWNERS
Change-Id: I7c848855a2d7a0d7f33123ea4ef5c2d03977b495
Yi Kong [Tue, 6 Jun 2017 21:09:41 +0000 (21:09 +0000)]
Merge "Workaround for Clang emitting spurious Wunused-lambda-capture warning"
Yi Kong [Thu, 1 Jun 2017 17:53:59 +0000 (10:53 -0700)]
Workaround for Clang emitting spurious Wunused-lambda-capture warning
Bug:
38349491
Test: Build
Change-Id: I642108d456a1a9bd548cdeaf1ad46b98fc447c8a
Treehugger Robot [Fri, 26 May 2017 23:01:16 +0000 (23:01 +0000)]
Merge "Android.mk: remove $TOP in LOCAL_C_INCLUDES"
YOUNG HO CHA [Thu, 25 May 2017 14:16:51 +0000 (23:16 +0900)]
Android.mk: remove $TOP in LOCAL_C_INCLUDES
Test: make systemimage
Change-Id: I5f83786afe3f2c65819b127b041cb74fc4c989ac
Signed-off-by: YOUNG HO CHA <ganadist@gmail.com>
Treehugger Robot [Tue, 23 May 2017 16:01:50 +0000 (16:01 +0000)]
Merge "libeffects: move all libraries to vendor"
SzuWei Lin [Tue, 23 May 2017 03:32:31 +0000 (11:32 +0800)]
libeffects: move all libraries to vendor
Bug:
37490685
Test: equalizer works in google play music
Test: CleanSpec works
Change-Id: I9c1d19b5b5c5099edc9c20ff7728adc830ff4786
Colin Cross [Wed, 17 May 2017 17:26:39 +0000 (17:26 +0000)]
Merge "Convert libmediandk to Android.bp"
Colin Cross [Thu, 4 May 2017 23:19:06 +0000 (16:19 -0700)]
Convert libmediandk to Android.bp
See build/soong/README.md for more information.
Test: m -j checkbuild
Merged-In: I1d0aa1ba2da52a430d93b4c64bebf900f5af3a78
Change-Id: I1d0aa1ba2da52a430d93b4c64bebf900f5af3a78
Treehugger Robot [Tue, 9 May 2017 22:51:06 +0000 (22:51 +0000)]
Merge "Convert libstagefright to Android.bp"
Colin Cross [Fri, 21 Apr 2017 00:30:33 +0000 (17:30 -0700)]
Convert libstagefright to Android.bp
See build/soong/README.md for more information
Test: builds
Change-Id: I74cfc651d07cbbaddeae7c4da9da6f2527aee691
Merged-In: I74cfc651d07cbbaddeae7c4da9da6f2527aee691
(cherry picked from commit
6f82b4d3e970469de830d9fffcfcbea800e4637e)
Treehugger Robot [Sat, 6 May 2017 01:58:12 +0000 (01:58 +0000)]
Merge "Replace LOCAL_C_INCLUDES with header lib dependency."
Treehugger Robot [Sat, 6 May 2017 00:14:31 +0000 (00:14 +0000)]
Merge changes I937ac6ab,Ib94f78f7
* changes:
Fix compiler warnings.
Fix warnings in bitrotted module
Steven Moreland [Thu, 4 May 2017 21:13:59 +0000 (14:13 -0700)]
Replace LOCAL_C_INCLUDES with header lib dependency.
Test: works with BOARD_VNDK_VERSION=current
Bug:
33241851
Change-Id: I8d3c47fe3d4b7dfe69d04e1f9ea1263cde067174
Tomasz Wasilczyk [Fri, 5 May 2017 22:40:51 +0000 (22:40 +0000)]
Merge "Convert libmtp to soong."
Colin Cross [Fri, 5 May 2017 22:27:29 +0000 (22:27 +0000)]
Merge "Use %zu to print size_t"
Colin Cross [Fri, 5 May 2017 22:25:05 +0000 (22:25 +0000)]
Merge "Move libmediandk and libcamera2ndk headers"
Ting-Yuan Huang [Fri, 23 Sep 2016 23:12:41 +0000 (16:12 -0700)]
Fix compiler warnings.
Test: mmm
Change-Id: I937ac6ab2da5530ee249e6e87a90d18e9bd3de6e
Merged-In: I937ac6ab2da5530ee249e6e87a90d18e9bd3de6e
(cherry picked from commit
87eef41a5b81391b10a0f4ad874f6f04e261ed84)
Colin Cross [Fri, 28 Apr 2017 23:43:52 +0000 (16:43 -0700)]
Use %zu to print size_t
Test: m -j checkbuild
Change-Id: I93a1da7241169e0e08d310ad7fad68f227629be6
Merged-In: I93a1da7241169e0e08d310ad7fad68f227629be6
(cherry picked from commit
cb8f367327286714617c0ccd7b356abd3a8aa15b)
Colin Cross [Fri, 21 Apr 2017 01:10:20 +0000 (18:10 -0700)]
Fix warnings in bitrotted module
Test: builds
Change-Id: Ib94f78f7baffbc63cff708ca5d81233618f30015
Colin Cross [Fri, 5 May 2017 01:30:44 +0000 (18:30 -0700)]
Move libmediandk and libcamera2ndk headers
Move libmediandk and libcamera2ndk headers into their module
and export them from there. Also move them to the same path
relative to the export as used in the NDK, media/ for
libmediandk and camera/ for libcamera2ndk.
Test: builds
Change-Id: I0b424e0e48bfb5e2b762694a97d799de08f5dda3
Merged-In: I0b424e0e48bfb5e2b762694a97d799de08f5dda3
(cherry picked from commit
7e8d4ba5887affda749978d787b898bf31fda729)
Tomasz Wasilczyk [Fri, 5 May 2017 16:51:37 +0000 (09:51 -0700)]
Convert libmtp to soong.
Bug:
37512442
Test: native test
Change-Id: Idf0e96a206faadc5a3179f0df564ab1d4daacda2
Colin Cross [Thu, 4 May 2017 20:54:47 +0000 (20:54 +0000)]
Merge "Convert libdrmframework and drmserver to Android.bp"
Colin Cross [Thu, 4 May 2017 14:51:04 +0000 (14:51 +0000)]
Merge "Convert libmedia to Android.bp"
Treehugger Robot [Thu, 4 May 2017 05:10:41 +0000 (05:10 +0000)]
Merge "libeffects: move all libraries to vendor"
Colin Cross [Fri, 28 Apr 2017 22:13:07 +0000 (15:13 -0700)]
Convert libdrmframework and drmserver to Android.bp
See build/soong/README.md for more information.
Also moves a few headers into the same library as their
implementation, and fixes a few includes to go through the
global frameworks/av/include path instead of manually adding
frameworks/av/include/drm.
Test: m -j checkbuild
Change-Id: I0c2d2f2262e7ed78d80a0d44795705c64b797ff0
Colin Cross [Thu, 20 Apr 2017 19:48:51 +0000 (12:48 -0700)]
Convert libmedia to Android.bp
See build/soong/README.md for more information.
Test: m -j checkbuild
Change-Id: I7326405e50dd847ba9528aee5e5cd79f204c44af
(cherry picked from commit
eeb436397a78aa80e41a4929a5f379319eefe0c3)
Treehugger Robot [Wed, 3 May 2017 21:42:09 +0000 (21:42 +0000)]
Merge "Mark functions in headers with static inline"
Christopher Ferris [Wed, 3 May 2017 17:43:33 +0000 (17:43 +0000)]
Merge "Remove reference to libc_logging."
SzuWei Lin [Thu, 27 Apr 2017 06:38:23 +0000 (14:38 +0800)]
libeffects: move all libraries to vendor
Bug:
37490685
Test: equalizer works in google play music
Test: CleanSpec works
Merged-In: I323f4048bce8a512d8aaa1760aef9d176a282c2d
Change-Id: I323f4048bce8a512d8aaa1760aef9d176a282c2d
(cherry picked from commit
df57a30938ee4cc9b1c32f81ec54445466cbb858)
Colin Cross [Wed, 3 May 2017 01:50:35 +0000 (01:50 +0000)]
Merge changes I155f9f77,Ibb1aa07a,If460a6ef,Ifabff1c2
* changes:
Fix trivial warnings hidden by -isystem
Fix non-trivial warnings hidden by -isystem
Rename SurfaceMediaSource::dump to dumpState
HACK: work around both android-base/logging.h and ADebug.h defining CHECK
Colin Cross [Tue, 2 May 2017 22:26:45 +0000 (15:26 -0700)]
Mark functions in headers with static inline
Functions in headers that are not static inline will cause duplicate
symbol errors when linking if the header is ever included twice
into different compilation units of the same module. It also causes
-Wunused-function warnings if they are not used in the cpp file, which
were hidden by the use of -isystem frameworks/av/include.
Bug:
31751828
Test: m -j checkbuild
Change-Id: I36f258bb4f5c3df54e874280beab344e63c519d5
Merged-In: I36f258bb4f5c3df54e874280beab344e63c519d5
(cherry picked from commit
413adafb04005fc5cdfdcbb3fe1ee4cfee9765b1)
Treehugger Robot [Tue, 2 May 2017 23:06:23 +0000 (23:06 +0000)]
Merge "libcpustats: Android.mk -> Android.bp"
Colin Cross [Thu, 27 Apr 2017 23:15:51 +0000 (16:15 -0700)]
Fix trivial warnings hidden by -isystem
Fix the trivial warnings that are hidden by the use of -isystem to
include frameworks/av and caught by -Werror.
Test: m -j checkbuild
Bug:
31751828
Change-Id: I155f9f772ce0a84b364313814cb7cf528b9de4eb
Merged-In: I155f9f772ce0a84b364313814cb7cf528b9de4eb
(cherry picked from commit
b8c35f94470d1518e2def0582aaec4e038c92af0)
Colin Cross [Fri, 28 Apr 2017 19:46:17 +0000 (12:46 -0700)]
Fix non-trivial warnings hidden by -isystem
These warnings were hidden by -isystem.
Bug:
31751828
Test: m -j checkbuild
Change-Id: Ibb1aa07a6827fcbd29fc15291fcd90280c0f608d
Merged-In: Ibb1aa07a6827fcbd29fc15291fcd90280c0f608d
(cherry picked from commit
6f51c153ea5e4187a313e47ac8bad9a1a999d4e1)
Colin Cross [Fri, 28 Apr 2017 03:12:04 +0000 (20:12 -0700)]
Rename SurfaceMediaSource::dump to dumpState
A method named dump() is already exported by Binder. The warnings
were hidden by the use of -isystem to include frameworks/av/include.
Bug:
31751828
Test: m -j checkbuild
Change-Id: If460a6efc7c7b108243c3ef068c28619482f599d
Merged-In: If460a6efc7c7b108243c3ef068c28619482f599d
(cherry picked from commit
f461f38e08ca8afb89e1dc33beae43905f47f9f8)
Colin Cross [Fri, 28 Apr 2017 06:18:29 +0000 (23:18 -0700)]
HACK: work around both android-base/logging.h and ADebug.h defining CHECK
One version of the CHECK_* macros are defined by
android-base/logging.h, and another by ADebug.h. Eventually
the ADebug.h ones should be replaced with the libbase ones, but
that ripples out into a long dependency chain that needs to link
against libbase. The redefined macro warnings were hidden by the
use of -isystem to include frameworks/av/include. Hack around it
for now by undefining the libbase ones if they exist.
Bug:
31751828
Bug:
37782039
Test: m -j checkbuild
Change-Id: Ifabff1c2bc6bac198804c951e98f3fee282cd018
Merged-In: Ifabff1c2bc6bac198804c951e98f3fee282cd018
(cherry picked from commit
1b1686db53d3e8c9f4c1b8c7bb360bb6437337ab)
Steven Moreland [Tue, 2 May 2017 20:40:16 +0000 (13:40 -0700)]
libcpustats: Android.mk -> Android.bp
Test: links
Change-Id: I4b7394299ad0f879ea8cc34ba95a8c6041513d53
Christopher Ferris [Tue, 25 Apr 2017 20:05:49 +0000 (13:05 -0700)]
Remove reference to libc_logging.
The libc_malloc_debug_backtrace includes the log functions so there
is no need to also add the libc log library.
Test: Built and booted a bullhead device.
Change-Id: I00457ad0c321b385e68232ee87575588a8188db7
Colin Cross [Mon, 1 May 2017 22:33:38 +0000 (22:33 +0000)]
Merge "Convert libmediadrm to Android.bp"
Colin Cross [Mon, 1 May 2017 22:33:26 +0000 (22:33 +0000)]
Merge "Fix warnings hidden by -isystem"
Colin Cross [Fri, 21 Apr 2017 06:21:01 +0000 (23:21 -0700)]
Convert libmediadrm to Android.bp
See build/soong/README.md for more information.
Test: m -j checkbuild
Change-Id: Icfc13bb5f55fa156ef72d3cf3a327e38739d775b
Merged-In: Icfc13bb5f55fa156ef72d3cf3a327e38739d775b
(cherry picked from commit
53f2035f1d78499df816e2ef6ddb90421b0bfd72)
Colin Cross [Thu, 27 Apr 2017 23:15:51 +0000 (16:15 -0700)]
Fix warnings hidden by -isystem
Fix -Wundefined-var-template and -Wsign-compare warnings that were
hidden by the use of -isystem to include frameworks/av.
Test: m -j native
Bug:
31751828
Change-Id: I28e07b238d5bc913ea2f3dfa09fa02f577d5a250
Merged-In: I28e07b238d5bc913ea2f3dfa09fa02f577d5a250
(cherry picked from commit
d995c0186ee0fc13f397a35808a1bc8045ab48d0)
Elliott Hughes [Mon, 1 May 2017 14:49:20 +0000 (14:49 +0000)]
Merge "Remove unused #include."
Elliott Hughes [Sat, 29 Apr 2017 17:16:54 +0000 (10:16 -0700)]
Remove unused #include.
Bug: N/A
Test: builds
Change-Id: Ia493566414e7d08ae12bb9ba754d5c207eed8d3e
Treehugger Robot [Fri, 28 Apr 2017 23:50:47 +0000 (23:50 +0000)]
Merge changes Ib249b276,Ica1d0286,If4914340
* changes:
LOCAL_CLANG := true is now the default
stagefright: move several static methods out of ACodec
stagefright: move MediaDefs from libstagefright to libmedia
Greg Kaiser [Fri, 28 Apr 2017 22:40:41 +0000 (22:40 +0000)]
Merge "MockDrmCryptoPlugin: Don't truncate log output"
Colin Cross [Thu, 27 Apr 2017 19:33:20 +0000 (12:33 -0700)]
LOCAL_CLANG := true is now the default
Test: verify that build has no failures
Change-Id: Ib249b276c6295e55eb54fa37b6d15486415dfbed
Merged-In: Ib249b276c6295e55eb54fa37b6d15486415dfbed
(cherry picked from commit
5f5ee1110dd85001b43db7637a97474acfe8d681)
Wonsik Kim [Fri, 4 Mar 2016 09:22:15 +0000 (18:22 +0900)]
stagefright: move several static methods out of ACodec
Bug:
24761407
Change-Id: Ica1d0286b1e800f5d4d0f120c043c0a556dab4c2
Merged-In: Ica1d0286b1e800f5d4d0f120c043c0a556dab4c2
(cherry picked from commit
1ad5b240bfd49aa918092dbdc18c1a24c5e6c3a4)
Wonsik Kim [Fri, 4 Mar 2016 09:22:15 +0000 (18:22 +0900)]
stagefright: move MediaDefs from libstagefright to libmedia
Bug:
24761407
Change-Id: If4914340a645c6f3c14eea0c873c162926d72ca2
(cherry picked from commit
ce4df5e534eb86748fe80c84efb6b7fc0b6b5b46)
Greg Kaiser [Tue, 25 Apr 2017 22:12:07 +0000 (15:12 -0700)]
MockDrmCryptoPlugin: Don't truncate log output
A function argument which is an array with a fixed size is not
actually a fixed size array, but rather just a pointer. Thus,
when we were using sizeof() for 'key' and 'iv', we were mostly
likely only logging the first 4 or 8 bytes of the array, and
not all 16.
We change this code so we're at least passing the correct size
to the arrayToString method, and thus logging all the bytes.
This API is still fragile, as there is nothing which assures
callers to decrypt are passing in arrays which are exactly 16
bytes. However, this API is equivalent to before, so we aren't
introducing any compatibility issues.
The compiler gave a warning about this.
Test: Compiled and confirmed there's no longer this compiler warning.
Change-Id: Ie3a32eef0882ea95bccc3e22ffcab7336779bd4c
Treehugger Robot [Thu, 27 Apr 2017 22:29:18 +0000 (22:29 +0000)]
Merge "mtp: Preserve last modified time of files."
caozhiyuan [Wed, 26 Apr 2017 08:52:30 +0000 (16:52 +0800)]
mtp: Preserve last modified time of files.
Bug:
6325175
Test: Transfer files
Change-Id: I54af3205575f2bb83c732bb70907f60e0b785e91
Signed-off-by: caozhiyuan <cao.zhiyuan@zte.com.cn>
Dimitry Ivanov [Wed, 26 Apr 2017 02:09:04 +0000 (02:09 +0000)]
Merge "Allow fstatfs64 syscall for mediacodec/extractor"
Dimitry Ivanov [Tue, 25 Apr 2017 23:55:03 +0000 (16:55 -0700)]
Allow fstatfs64 syscall for mediacodec/extractor
This syscall is used by the linker to detect files located on tmpfs
Bug: http://b/
37245203
Bug: http://b/
37590327
Test: boot an angler and check that mediacodec does not crash
Change-Id: I7147063db7d6b8ec39a25d39b60e8e6882addf6e
(cherry picked from commit
1516b02c1a4ab5739bffea9d75ad9b52fc1d5b91)
Colin Cross [Tue, 25 Apr 2017 01:01:31 +0000 (01:01 +0000)]
Merge changes I0dc38288,I48b713cd
* changes:
libmediautils: mk -> bp
Clean up mediadrm dependencies
Steven Moreland [Fri, 7 Apr 2017 17:44:52 +0000 (10:44 -0700)]
libmediautils: mk -> bp
Test: module built and works with scheduleservice
Bug:
29251823
Change-Id: I0dc38288b66f03919dbb9ab8abcc76dec19b0b30
(cherry picked from commit
22ee46008d6fb8eb4cbe8aa62acf3899e5da3a92)
Marco Nelissen [Tue, 8 Nov 2016 00:34:52 +0000 (16:34 -0800)]
Clean up mediadrm dependencies
Move various things around so mediadrmserver doesn't need
libstagefright and libmedia
Test: build/boot
Change-Id: I48b713cd679b992cb6ad1262c20394a9892d7027
Merged-In: I48b713cd679b992cb6ad1262c20394a9892d7027
(cherry picked from commit
75571e4bc76bd2defd4309c7154120840396329d)
Dan Willemsen [Thu, 20 Apr 2017 15:05:26 +0000 (15:05 +0000)]
Merge "Convert libcamera_client to Android.bp"
Dan Willemsen [Thu, 20 Apr 2017 15:05:14 +0000 (15:05 +0000)]
Merge "DO NOT MERGE: Move camera headers to camera/include"
Dan Willemsen [Thu, 20 Apr 2017 02:23:50 +0000 (19:23 -0700)]
Convert libcamera_client to Android.bp
See build/soong/README.md for more information
Test: m -j checkbuild
Change-Id: Ie3a82e929ea1e2c271e362bf0fa85f79fa9e9004
Dan Willemsen [Thu, 20 Apr 2017 02:49:08 +0000 (19:49 -0700)]
DO NOT MERGE: Move camera headers to camera/include
In preparation for moving libcamera_client to Soong, this is a backport
of the camera portion of the change to move headers from include/ into
the appropriate directories.
include/camera -> camera/include/camera
Adds a symlink from the old location to the new one.
Bug:
33241851
Test: mmma -j frameworks/av/camera
Change-Id: Ic508c2d0100f4e84b63e745d50eca1402b6fed6c
(cherry picked from commit
d008fd1e4f4cadd300355ece1547ec56d80227dc)
Colin Cross [Thu, 20 Apr 2017 03:21:02 +0000 (03:21 +0000)]
Merge changes If9daee8f,I09ab3bfc,I854760bd
* changes:
Convert libradio to Android.bp
Convert libsoundtrigger to Android.bp
Convert libimg_utils to Android.bp
Colin Cross [Thu, 20 Apr 2017 01:01:02 +0000 (18:01 -0700)]
Convert libradio to Android.bp
See build/soong/README.md for more information.
Test: m -j checkbuild
Change-Id: If9daee8fea744a5d70cf0ea6efb2a806b6cffa36
Colin Cross [Thu, 20 Apr 2017 00:59:11 +0000 (17:59 -0700)]
Convert libsoundtrigger to Android.bp
See build/soong/README.md
Test: m -j checkbuild
Change-Id: I09ab3bfc8649bda8bad66c0898e342865f8b4a92
Colin Cross [Thu, 20 Apr 2017 00:51:04 +0000 (17:51 -0700)]
Convert libimg_utils to Android.bp
See build/soong/README.md for more information.
Test: m -j checkbuild
Change-Id: I854760bd1f7ab054feb2496d2d18eee35ad8b9f2
Treehugger Robot [Wed, 19 Apr 2017 01:49:25 +0000 (01:49 +0000)]
Merge "Fix clang static analyzer warnings."
Manoj Gupta [Tue, 18 Apr 2017 23:41:09 +0000 (16:41 -0700)]
Fix clang static analyzer warnings.
Fix the following warning:
frameworks/av/media/mtp/MtpServer.cpp:1098:5: warning: Assigned value is
garbage or undefined [clang-analyzer-core.uninitialized.Assign]
BUG:None
TEST:Warnings fixed.
Change-Id: If4e54ebd9b865e2e6cdc7666da0c9987a918df7c
Treehugger Robot [Thu, 13 Apr 2017 16:19:33 +0000 (16:19 +0000)]
Merge "Remove useless code in aacenc"
liuchao [Thu, 13 Apr 2017 06:27:28 +0000 (14:27 +0800)]
Remove useless code in aacenc
Remove useless code in aacenc for better understanding
Test: mm -j8
Change-Id: I6f5a1dcfea5dd3642d1c607be68103039cbb8c53
Treehugger Robot [Tue, 11 Apr 2017 16:19:14 +0000 (16:19 +0000)]
Merge "Remove .(ll)ndk suffix from (ll)ndk_library"
Dan Willemsen [Fri, 7 Apr 2017 22:48:32 +0000 (15:48 -0700)]
Remove .(ll)ndk suffix from (ll)ndk_library
Soong handles these automatically now.
Bug:
33241851
Test: Android-aosp_arm.mk is the same before/after
Test: build.ninja is the same before/after
Test: build-aosp_arm.ninja is the same before/after
Merged-In: I792e4647b38988db5d9f591d69688479ce9dc62b
Change-Id: I792e4647b38988db5d9f591d69688479ce9dc62b
Krystian Turczyn [Wed, 29 Mar 2017 00:44:02 +0000 (00:44 +0000)]
Merge "Do not seek when switching to background playback"
am:
3db1bb97a7
Change-Id: I2c894349941e1a9bcfe329f4c40b0caea85987de
Treehugger Robot [Wed, 29 Mar 2017 00:39:55 +0000 (00:39 +0000)]
Merge "Do not seek when switching to background playback"
Marco Nelissen [Fri, 17 Mar 2017 17:12:45 +0000 (17:12 +0000)]
Merge "Remove old software avc encoder"
am:
fb20749bfa
Change-Id: Iaedc1950b61aca0cb87e808606f6e743419b371d
Marco Nelissen [Fri, 17 Mar 2017 17:02:07 +0000 (17:02 +0000)]
Merge "Remove old software avc encoder"
Marco Nelissen [Thu, 16 Mar 2017 17:04:38 +0000 (10:04 -0700)]
Remove old software avc encoder
It hasn't been used since Lollipop
Test: build
Change-Id: I7652973b50426b3bcf8c10dcc77deb97366b003c
Eric Laurent [Thu, 16 Mar 2017 02:01:17 +0000 (02:01 +0000)]
Merge "audio policy: add rule for ringtone duplication over speaker + SCO"
am:
dc671c4e33
Change-Id: Ic19309906b00121c4cd02ff8ed620416d5b9678f
Treehugger Robot [Thu, 16 Mar 2017 01:57:08 +0000 (01:57 +0000)]
Merge "audio policy: add rule for ringtone duplication over speaker + SCO"
Eric Laurent [Sat, 28 Jan 2017 01:41:53 +0000 (17:41 -0800)]
audio policy: add rule for ringtone duplication over speaker + SCO
Bug:
19171297
Test: make, testplans/79248
Change-Id: Ic539256e53782806d5dbbca5fb6ebe9f2ca5ec76
Ming Zhou [Wed, 15 Mar 2017 16:22:58 +0000 (16:22 +0000)]
Merge "parameter passed to BnHDCP::onTransact() is incorrect when calling decrypt function."
am:
5052e9cf9f
Change-Id: I4eaf334bd11e1b91d68d40c0958f14364ee9b471
Treehugger Robot [Wed, 15 Mar 2017 16:19:13 +0000 (16:19 +0000)]
Merge "parameter passed to BnHDCP::onTransact() is incorrect when calling decrypt function."
Ming Zhou [Mon, 19 Jan 2015 09:20:44 +0000 (17:20 +0800)]
parameter passed to BnHDCP::onTransact() is incorrect when calling decrypt function.
Change-Id: Iba8e74a0043877a167e4b290b2257fcd990076b8
Signed-off-by: Ming Zhou <b42586@freescale.com>
Reviewed-on: http://androidsource.ap.freescale.net/project/504
Reviewed-by: Jian Li <jian.li@nxp.com>
Jerry Zhang [Wed, 8 Mar 2017 00:22:29 +0000 (00:22 +0000)]
Merge "Add support for MTP_RESET_DEVICE operation."
am:
52afe9d2cf
Change-Id: I36c8e325e2b2dde85cb2a3546508c95e5da77e57