summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-06-05am 540e7ee8: Merge "Build on host as 32-bit as there are 64-bit bugs in this ↵android-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1lollipop-releaselollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaselollipop-devlollipop-cts-releaseIan Rogers
code." * commit '540e7ee8dbf1d7ee72ef45c92efbebcb89bf6d1a': Build on host as 32-bit as there are 64-bit bugs in this code.
2014-06-05Merge "Build on host as 32-bit as there are 64-bit bugs in this code."android-l-preview_r2l-previewIan Rogers
2014-06-05Build on host as 32-bit as there are 64-bit bugs in this code.Ian Rogers
Change-Id: Ibc751d63a22acac7ee1a024e21f1ee68079b330e
2014-05-29am 6b265bd4: Merge "Revert "Revert "Fix the mac build."""Ian Rogers
* commit '6b265bd4a12e7518a275dddf41c33279bea8e16b': Revert "Revert "Fix the mac build.""
2014-05-29am 079e6e4c: Merge "Revert "Fix the mac build.""Ian Rogers
* commit '079e6e4cfbd1a0b1ab2e94e6d52a7304321ae597': Revert "Fix the mac build."
2014-05-29Merge "Revert "Revert "Fix the mac build."""Ian Rogers
2014-05-28Revert "Revert "Fix the mac build.""Ian Rogers
This reverts commit a8a167d6883e4acee42619e0bbfd811984f6e94d. Also, workaround a clang 3.5 issue bug: 15319952 Change-Id: If2ec321d63d9484c21208339f66eb6a16b65bf74
2014-05-29cherry-pick ahead of the automerger: Merge "Revert "Fix the mac build.""Ian Rogers
2014-05-29Merge "Revert "Fix the mac build.""Ian Rogers
2014-05-28Revert "Fix the mac build."Ian Rogers
This reverts commit 560eaab489316778f491132c7b05a647b098d2a0.
2014-05-29Merge "Fix the mac build."Ian Rogers
2014-05-28Fix the mac build.Ian Rogers
Switch host compiles to clang with libc++. Fix clang build errors. Change-Id: I1a039d505b301a970d53dbdf5882ed609d930aa4
2014-05-28Merge "Fix 64-bit issues and compiler warnings."Ian Rogers
2014-05-28Fix 64-bit issues and compiler warnings.Ian Rogers
Enabled -Werror on a 64-bit host build (BUILD_HOST_64bit=1), ignored unused parameter warnings and then cleaned up what remained. The most concerning issue was always true comparisons caused by comparing an unsigned int with a size_t. Migrate C++ code to use C++11.
2014-05-07Merge "Remove unused LOCAL_LDLIBS."Ying Wang
2014-05-07Remove unused LOCAL_LDLIBS.Ying Wang
Change-Id: Ia27471dd05966ac40814af5c83dc0ffb5aa63fbd
2014-02-06Merge "[MIPS64] Support mips64"idea133-weekly-releaseElliott Hughes
2014-02-05[MIPS64] Support mips64Duane Sand
Change-Id: Ib32fb0d4b6d3eb0fcef7e59da99c13217a530b7c
2014-01-24Merge "srec: rename aarch64 target to arm64"Colin Cross
2014-01-23srec: rename aarch64 target to arm64Colin Cross
Rename aarch64 build targets to arm64. The gcc toolchain is still aarch64. Change-Id: Ia92d8a50824e5329cf00fd6f4f92eae112b7f3a3
2014-01-16Merge "AArch64: Enable build on 64-bit AArch64 platform"Elliott Hughes
2014-01-15AArch64: Enable build on 64-bit AArch64 platformMarcus Oakland
Changes include [x] Addition of a new function lstrtosize_t Since size_t is not the same size as an unsigned int in AArch64, a new function lstrtosize_t has been devised for use in the shared/src/SessionTypeImpl.c and srec/Recognizer/src/RecognizerImpl.c modules in place of the lstrtoui function (which is for unsigned integers). lstrtosize_t is implemented in the portable/src/LCHAR.c module and declared in portable/include/LCHAR.h header file. It makes use of the LSTRTOULL macro defined in the portable/include/ptypes.h header file, indicating the function to be used to convert an unsigned long long to a string. [x] Changes in srec/cfront/sh_down.h header file This is because the value of LONG_MAX is different on __LP64__ with 64-bit longs, and the function converts to an int, not to a long. [x] Changes to the srec/test/SRecTest/src/SRecTest.c and srec/test/SRecTestAudio/src/SRecTestAudio.c modules These changes correct the parameter types for the call to SR_RecognizerPutAudio and pfread to be the expected size_t, again because size_t is not the same as unsigned int in __LP64__. [x] Rest of the changes are related to general conversion from 32-bit to 64-bit including proper casts of pointers, changes from int to long, jint to jlong. Change-Id: I3cc7d3a89161ab098a4bd133ea96b1158630b0e1 Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com> Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
2013-09-25am 35e5a031: Merge "x86_64/x32: Add targets"idea133Nick Kralevich
* commit '35e5a031b5087050c946977e40e1fd6f2790234f': x86_64/x32: Add targets
2013-09-25Merge "x86_64/x32: Add targets"Nick Kralevich
2013-09-20x86_64/x32: Add targetsPavel Chupin
This is required to continue builds of other projects. Change-Id: I4cfef71a4662810a86936afcbe6cf1e648b0736e Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
2013-09-06am 0bdaec87: Merge "Correct infinite loop in swicms_set_cmn"Nick Kralevich
* commit '0bdaec8763369edd362933d5202b0b3d5f99d07f': Correct infinite loop in swicms_set_cmn
2013-09-06Merge "Correct infinite loop in swicms_set_cmn"tools_r22.2Nick Kralevich
2013-09-06Correct infinite loop in swicms_set_cmnChrister Fletcher
When using Recognizer.setAcousticState a call is made down to swicms_set_cmn in srec. If a valid vector is provided swicms_set_cmn will loop indefinitely. Increase dim_count in the while loop to prevent it. Change-Id: I133bdaa6defd0677f56d0418832bb432d9feddba
2013-09-03am 250c97d6: Merge "Marking file-local inline functions as static"Nick Kralevich
* commit '250c97d651797efd5d95c8bbe1ac777572b03e43': Marking file-local inline functions as static
2013-09-03Merge "Marking file-local inline functions as static"Nick Kralevich
2013-06-13AudioRecord must be used as sp<> onlyandroid-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r4android-cts-4.4_r1android-4.4w_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8android-4.4_r0.7android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1kitkat-wearkitkat-releasekitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devkitkat-cts-releasekitkat-cts-devGlenn Kasten
Bug: 9423855 Change-Id: Ic89aa66383fae603f6a8ff23e61dd520f6e990af
2013-04-09Add liblogandroid-4.3_r3.1android-4.3_r3android-4.3_r2.3android-4.3_r2.2android-4.3_r2.1android-4.3_r2android-4.3_r1.1android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9android-4.3.1_r1jb-mr2.0.0-releasejb-mr2.0-releasejb-mr2-releasejb-mr2-devYing Wang
Bug: 8580410 Change-Id: Idb83d3ea0e76f1df03f5038388246dde661cf1b1
2012-11-22Marking file-local inline functions as staticEdwin Vane
Compiling with clang results with undefined symbol errors at link time for functions marked inline but not marked static or extern. A look at the C spec indicates the compiler is free to assume the function exists as a symbol elsewhere if static/extern are not used. Since this function really is meant to have static linkage, applied the static keyword and the build is now fine. Change-Id: I7c279c2592fe19ceda57fa3ecd565cc6f323b307 Author: Edwin Vane <edwin.vane@intel.com> Reviewed-by: Kevin P Schoedel <kevin.p.schoedel@intel.com>
2012-10-30Remove obsolete references to libmedia_nativeGlenn Kasten
Bug: 6654403 Change-Id: I2f35bc60365a3d866a9b066c574a09fbddd42958
2012-08-13am dc315ced: Merge "[MIPS] Add MIPS support"android-sdk-support_r11android-cts-4.2_r2android-cts-4.2_r1android-4.2_r1android-4.2.2_r1.2android-4.2.2_r1.1android-4.2.2_r1android-4.2.1_r1.2android-4.2.1_r1.1android-4.2.1_r1tools_r22jb-mr1.1-releasejb-mr1.1-dev-plus-aospjb-mr1.1-devjb-mr1-releasejb-mr1-dev-plus-aospjb-mr1-devJean-Baptiste Queru
* commit 'dc315cedb10875c8e7ccf8d9af45131993003244': [MIPS] Add MIPS support
2012-08-13Merge "[MIPS] Add MIPS support"tools_r21Jean-Baptiste Queru
2012-08-10[MIPS] Add MIPS supportChris Dearman
Signed-off-by: Chris Dearman <chris@mips.com>
2012-07-13AudioRecord::stop() returns voidGlenn Kasten
like AudioTrack::stop() Change-Id: I31015fee8bb8bf1650cc55b6e3f77b55e81c13cc
2012-06-22Remove AudioRecord record_flagsGlenn Kasten
Change-Id: I69d781eca9fdf174dc5d8db0bebc35da2bdbae5e
2012-06-18am b02a57d1: am 3b86e1f2: Don\'t use ALL_PREBUILTYing Wang
* commit 'b02a57d1448283477d13b248a6beb2754b9430fd': Don't use ALL_PREBUILT
2012-06-18am 3b86e1f2: Don\'t use ALL_PREBUILTYing Wang
* commit '3b86e1f2371f3bfb4b798d5c7671bf8ed79f5caf': Don't use ALL_PREBUILT
2012-06-15Don't use ALL_PREBUILTandroid-cts-4.1_r4android-cts-4.1_r2android-cts-4.1_r1android-4.1.2_r2.1android-4.1.2_r2android-4.1.2_r1android-4.1.1_r6.1android-4.1.1_r6android-4.1.1_r5android-4.1.1_r4android-4.1.1_r3android-4.1.1_r2android-4.1.1_r1.1android-4.1.1_r1jb-releasejb-mr0-releasejb-devYing Wang
Bug: 6294985 With ALL_PREBUILT it just installs the data files to all devices. We switch to a config.mk, which will be included by module definition of VoiceDialer.apk and set up the necessary dependency. TODO: modulize the config files and have VoiceDialer.apk depend on them. Change-Id: I25ecb9888960806acda808ef8f5e88fe9bcb48bb
2012-05-15Remove obsolete ThirdPartyProject.prop file.Elliott Hughes
Change-Id: I847cf7e70f043c985c3e7f62b7b4d6b3b92b2e43
2012-05-07am caa4a614: Merge "Xcode 4.3 compatibility checkin"Jean-Baptiste Queru
* commit 'caa4a614d192210a0f1f819499e71a8b6daacf0f': Xcode 4.3 compatibility checkin
2012-05-07Merge "Xcode 4.3 compatibility checkin"android-sdk-adt_r20tools_r20ics-plus-aospJean-Baptiste Queru
2012-05-04am 84d13f37: Merge "Xcode 4.3 compatibility checkin"Jean-Baptiste Queru
* commit '84d13f373f031641743c4b08156529b8754a32a8': Xcode 4.3 compatibility checkin
2012-05-03Merge "Xcode 4.3 compatibility checkin"Jean-Baptiste Queru
2012-05-03Xcode 4.3 compatibility checkinAl Sutton
Xcode 4.3 is unable to find the inlined methods when linking libSR_Recognizer, so this patch clears the definition of PINLINE for the Xcode 4.3 compiler which ensures that the methods which cause the errors are not inlined Change-Id: I28d0bdf084cb60e93db80fe8a8c7ad6d0dd01dc0 Signed-off-by: Al Sutton <al@funkyandroid.com>
2012-04-06Add NOTICE and MODULE_LICENSE_APACHE2 file for each Android.mkWei Zhong
Bug: 6299628 Change-Id: I8e4352b7db6499264106ba0e52e5c3e755a488b9 Signed-off-by: Wei Zhong <wzhong@google.com> (cherry picked from commit cc15631660de061ec4f65e8714c0836520b35ddf)
2012-03-19Add libmedia_native and remove obsolete libmediaGlenn Kasten
Change-Id: Ibaebc3c5fdf8b98a94a8b775a4e93add4fd379cf
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-24 14:55:48 +0000