summaryrefslogtreecommitdiffstats
path: root/core/jni/Android.mk
Commit message (Collapse)AuthorAgeFilesLines
* intel: Pick the best ABI based on number of libs, not just priorityChristopher R. Palmer2016-03-101-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | The normal package loading will open the APK and find the highest priority ABI that contains one or more native libraries. This works well for 64-bit vs. 32-bit but doesn't work very well for ARM vs. Intel ABIs. There are many broken apps in the market which fail to run when installed as x86. I believe that there are so many apps because an app that doesn't itself have native x86 libs but imports a 3rd party lib that does support x86 will end up installin the x86 libs for the support library which fools the package installer. As a simple heuristic, pick the ABI that contains the most shared libraries. That works around the common case of missing the app's own shared libraries. Note: the consequences of picking incorrectly are actually quite small since the app should still run, although it will run less efficiently because it is emulated. Note: if two ABIs have the same number of libs, we pick the higher priority one as a tie-breaker. Change-Id: Ie4880810f46875869ce054b3c46acac64b953996
* Merge tag 'android-6.0.0_r26' into HEADRicardo Cerqueira2015-11-051-0/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android 6.0.0 release 26 Conflicts: cmds/bootanimation/BootAnimation.cpp core/java/android/accounts/AccountManager.java core/java/android/app/AppOpsManager.java core/java/android/os/PowerManagerInternal.java core/java/android/os/storage/IMountService.java core/java/android/provider/Settings.java core/java/com/android/internal/widget/ILockSettings.aidl core/res/res/values-mcc204-mnc12/config.xml core/res/res/values-mcc219-mnc02/config.xml core/res/res/values-mcc730-mnc07/config.xml core/res/res/values/config.xml core/res/res/values/symbols.xml packages/SystemUI/res/values/config.xml packages/SystemUI/src/com/android/systemui/doze/DozeService.java packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java packages/SystemUI/src/com/android/systemui/statusbar/ExpandableOutlineView.java packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeScrimController.java packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java services/core/java/com/android/server/LocationManagerService.java services/core/java/com/android/server/am/ActivityManagerService.java services/core/java/com/android/server/pm/PackageManagerService.java services/core/java/com/android/server/power/PowerManagerService.java telecomm/java/android/telecom/Phone.java telephony/java/android/telephony/CarrierConfigManager.java telephony/java/android/telephony/RadioAccessFamily.java telephony/java/android/telephony/ServiceState.java telephony/java/android/telephony/SignalStrength.java telephony/java/android/telephony/TelephonyManager.java telephony/java/com/android/ims/ImsCallProfile.java telephony/java/com/android/ims/ImsReasonInfo.java telephony/java/com/android/ims/ImsSuppServiceNotification.aidl telephony/java/com/android/ims/ImsSuppServiceNotification.java telephony/java/com/android/ims/internal/IImsRegistrationListener.aidl telephony/java/com/android/internal/telephony/RILConstants.java Change-Id: I99c6edb8e25a77145b5adef97d0d55bfbe676959
| * am b08c24a3: Frameworks/base: Disable Clang in core/jniAndreas Gampe2015-08-111-0/+4
| |\ | | | | | | | | | | | | * commit 'b08c24a3e4f5362bbddc3735802e844e1992cd46': Frameworks/base: Disable Clang in core/jni
| * | Add boost to increase the load on newly-forked zygote processes.Tim Murray2015-08-051-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Makes it more likely for app launches to end up on a large core in an HMP environment. bug 21915482 Change-Id: Ieac192a4bc1237dd03b9492fcad3a78de5510a58
* | | Remove Qualcomm BoostFrameworkSteve Kondik2015-11-011-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * This is gonna get really sketchy with the proprietary bits, and we have our own solution. Revert all associated patches. Revert "BoostFramework: Adding config for disable packing params & scroll fix" This reverts commit a313bfae1213dcf8e0845e90f260aada5026685e. Revert "Perf: Adding hooks for IO prefetcher into framework" This reverts commit 96e75fcafbeb77427ff4407e80a5d05bf92ec732. Revert "frameworks/base: Add support for low resolution rendering" This reverts commit d5282e055963a44df64265e4a592750e31bd9901. Revert "frameworks/base: support for loading wfd whitelist dynamic libraries" This reverts commit 79a889bcf6e4c96db48bfb755b7c7e100f4800b1. Revert "ActivityTrigger: New class to invoke when activity starts/resumes" This reverts commit 20d6e3c9b06d790e5ede4b1aa585d43a7d72b560. Revert "BoostFramework to enchance performance during critical scenarios" This reverts commit 0c3a49a56f827e16d038542b0a81c0e257787995. Change-Id: Ibc81f3150f4bea572f869be688ebfade11b27307
* | | SEEMP: Add more framework instrumentationWilliam Clark2015-10-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Instrument framework files to log events of interest. Conflicts: core/java/android/accounts/AccountManager.java Change-Id: Ia45651e6352586f910039b51cac2356f65f80010
* | | ActivityTrigger: New class to invoke when activity starts/resumesTapas Kumar Kundu2015-10-061-1/+2
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes is combination of following commits: 1) Author: David Ng <dave@codeaurora.org> Proprietary client library needs to know activity name. Example:app trigger Change-Id: I3078ef90d0b1846cdbbf9eaefd68544263936040 2) Author: Rajulu Ponnada <rajulu@codeaurora.org> Change activity trigger api to include activity flags which can be changed if required in vendor specific library. Change-Id: Icfaab21fd4c5a6290f226a338870b9031d32b498 3) Author: Rajulu Ponnada <rajulu@codeaurora.org> support for opening/loading multiple dynamic libraries when apps' activity start/resume invoked Change-Id: Icf42e426870ee634920c2288e4075699c472d3a6 4) Author: Xin Qi <xqi@codeaurora.org> GetStringUTFChars() does not release memory untill ReleaseStringUTFChars() is called and causes memory leak. This change uses ReleaseStringUTFChars() to release unused buffer. Change-Id: If7f27ea35f5a1d1dd7c98fbe5f92729ab9ba0257 Change-Id: I089f1669e5711efcabbf1985d80b48c6e92893c6
* | Frameworks/base: Disable Clang in core/jniAndreas Gampe2015-08-111-0/+4
|/ | | | | | | | thread_local does not work with Clang at the moment. Bug: 22414716 Change-Id: I4059b63a1621c346bfc72dbbec0b9cb165485e26 (cherry picked from commit 2bc67a1b5f9d4662ef7da4645ca8e580302b3553)
* add cpuset supportTim Murray2015-06-221-0/+4
| | | | | | | | | This moves ActivityManager from using fg/bg cgroups to fg/bg cpusets, which improves load balancing on appropriate devices. bug 21782794 Change-Id: Ife149ea551b8b3611a826566b8c8fc8573fdf654
* Update the pdfium library - frameworkSvet Ganov2015-06-041-0/+1
| | | | Change-Id: I4880e9310c02c6e26d4560fb8515f2ce51c597f4
* Deprecations are warnings not errorsGlenn Kasten2015-05-281-1/+2
| | | | Change-Id: Ib77f45fdc27ea53f1dd181f48c76810d03f8dcdb
* Implement audio routing callbacksEric Laurent2015-05-061-0/+1
| | | | | | | | | | | | | | Implement JNI for AudioTrack and AudioRecord routing callbacks: - Added files core/jni/android_media_DeviceCallback.cpp/.h for JNI callback implementation used by both AudioTrack and AudioRecord. - Made AudioManager AudioPort and AudioPatch methods static in order to call them without context. Also added IO handle information to AudioMixPort. Change-Id: Icee182aa68310d4b12fd1469f48e78110889acf1
* Pass PlaybackSettings as class object for AudioTrack JNIAndy Hung2015-04-291-0/+1
| | | | Change-Id: Ic7fb5f84ed1fc4cc2286e5c207fee5298a64a5a4
* Prepare to make Fingerprint API public.Jim Miller2015-04-011-1/+0
| | | | | | | - move fingerprint support files into hardware area - move jni into services/core Change-Id: I48a8e43d6d328fb66d79919c255e4c44e984b4d1
* broadcast radio JNI.Eric Laurent2015-03-131-1/+4
| | | | | | Initial implementation of broadcast radio JNI. Change-Id: Ia01f567292295928fbf6d9c23de362867dc15314
* Merge "resolved conflicts for merge of 7545accf to master"Elliott Hughes2015-03-101-0/+2
|\
| * resolved conflicts for merge of 7545accf to masterElliott Hughes2015-03-101-0/+2
| |\ | | | | | | | | | Change-Id: I7a9264e818fdd14bf59f0dec63ab83985f9e66fb
| | * Use the icu:: namespace for icu4c API.Elliott Hughes2015-03-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | The icu guys recommend working this way, though it's not the default. Internally Google makes this the default, and I've switched libcore over. Bug: 15350832 Change-Id: I038e12bea58dd089a46d0e681b5ab76cfc19d7b9
* | | Rename and simplify DisplayList Canvas classesChris Craik2015-03-091-9/+9
|/ / | | | | | | Change-Id: I49fd2ce02e01401209fe2a378e9f9547c7b27c61
* | Cleanup Bitmap JNI attempt #2John Reck2015-03-051-1/+1
| | | | | | | | | | | | | | | | Original version missed a spot This reverts commit c02977e3bbfaaedcb1b1d67e1692becc7dddd59b. Change-Id: I56244ce10d709fcdef42a001fe4c6ba7b6bbb04d
* | Revert "Cleanup Bitmap JNI"Chad Jones2015-03-051-1/+1
| | | | | | | | | | | | This reverts commit b2915245b74b3b5541b123e38403f8e26426b4b7. Change-Id: Idd7d7f33eec4ea5024c83de6b10d3d1a6ab2b17a
* | Cleanup Bitmap JNIJohn Reck2015-03-051-1/+1
| | | | | | | | | | | | | | | | Fix a bunch of places where mNativeBitmap was being poked at directly, switch them either to the NDK API or to GraphicsJNI where it made sense Change-Id: I6b3df3712d6497cba828c2d3012e725cb4ebb64d
* | am 72e7217d: am b7121d70: am b78cce6f: Merge "Update autogenerated gl ↵Dan Albert2015-02-251-1/+1
|\ \ | |/ | | | | | | | | | | functions." * commit '72e7217d0bd1035fc0c947da5d1e802624774a80': Update autogenerated gl functions.
| * Update autogenerated gl functions.Dan Albert2015-02-231-1/+1
| | | | | | | | | | | | | | | | | | | | Corresponding frameworks/native change: https://android-review.googlesource.com/#/c/134491/ Since this fixes the int-to-pointer cast issues, stop ignoring that warning. Change-Id: I85134dc151ba368e4619e36125264b2b3f104202
* | AvoidXferMode -> AvoidXfermode.Leon Scroggins III2015-01-301-1/+1
| | | | | | | | | | | | | | | | When I moved this code here from external/skia, I accidentally changed the lowercase 'm' to uppercase 'M'. Change back, to keep consistent with SkXfermode and Xfermode.cpp. Change-Id: I9694d29a22aaed7fcc8708f5962e3d2032297d08
* | Move SkAvoidXferMode into frameworks/base.Leon Scroggins III2015-01-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | We are removing it from Skia, so we need it here to support Android. Add some small cleanups (remove comment that doesn't apply, convert SK_OVERRIDE to override, remove 'virtual' keyword from methods with 'override' on them). BUG:skbug.com/3329 Change-Id: I1f883082d6fb9d49b9c9ba9e1f50bd713eabf915
* | Move CanvasJohn Reck2015-01-201-1/+0
| | | | | | | | Change-Id: I83d557af30fc2d5c69d06eedc0f4d52ac41c4210
* | am d3d95172: am 38c2dae5: Merge "Remove hardcoded include paths."Narayan Kamath2014-12-311-4/+0
|\ \ | |/ | | | | | | | | | | automerge: bdc3992 * commit 'bdc399299edf7f5f86c816dafe581e85e65dd2bd': Remove hardcoded include paths.
| * Remove hardcoded include paths.Narayan Kamath2014-12-311-4/+0
| | | | | | | | | | | | | | | | | | ICU, zlib & openssl export them using LOCAL_EXPORT_C_INCLUDE_DIRS. The dependency on libc/dns/include was bogus and can be removed trivially. bug: 18581021 Change-Id: I4b8047ff0df1050ab48b61c0c886888b3f2f0c18
* | Merge "Stop pretending USE_OPENGL_RENDERER is a thing"John Reck2014-12-181-8/+1
|\ \ | |/ |/|
| * Stop pretending USE_OPENGL_RENDERER is a thingJohn Reck2014-12-181-8/+1
| | | | | | | | Change-Id: I732b490431fe90eafa00a00f3b5429f0d3a067e6
* | Move the remaining ZygoteInit native code over to Java.Elliott Hughes2014-12-171-1/+0
|/ | | | | Bug: 18719692 Change-Id: I5f9834edecdbcc065a33a9921c740a53441636a4
* Frameworks/base: Consistency in core/jniAndreas Gampe2014-11-211-0/+4
| | | | | | | | Make consistent use of core_jni_helpers for registration. Translate some #ifdefs into const bools. Change-Id: I37639aa053dd50f003a552cbd8550dddecc811c5
* Frameworks/base: Ignore unknown pragmas in core/jniAndreas Gampe2014-11-181-1/+3
| | | | | | Preparation for a switch to Clang. Change-Id: Iabe1d79474a617bec66dd4bf58002b1a372f6d23
* Frameworks/base: Wall Werror in core/jniAndreas Gampe2014-11-131-224/+226
| | | | | | | | | | | Turn on -Wall -Werror in core/jni. Fix warnings. Clang TODO: For GCC we need to turn off Wunused-but-set-variable in the GL bindings. However, Clang doesn't have that warning and thus complains about an unknown pragma. It is necessary to make the pragma #ifdef-ed on the compiler being GCC. Change-Id: I14cab48d45c2771eef0432082356c47ed44a3d7f
* Move frameworks/base over to libc++.Dan Albert2014-11-121-2/+0
| | | | | Bug: 15193147 Change-Id: I96109d2d383f0c8a4aaa611f29fcf887afb3c69e
* am dfcf0655: am 09fd5a18: Merge "Replacing FloatMath native implementation ↵Neil Fuller2014-10-201-1/+0
|\ | | | | | | | | | | | | with calls to Math" * commit 'dfcf065505a12aa358af5cd2607fd355eee964c4': Replacing FloatMath native implementation with calls to Math
| * Replacing FloatMath native implementation with calls to MathNick Kralevich2014-10-201-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On modern versions of Android running in AOT mode FloatMath is slower than Math. Calls to Math.sqrt(), etc. are replaced by intrinsics which can be as small as a single CPU opcode. When running in interpreted mode the new implementation is unfortunately slower, but I'm judging this acceptable and likely to be improved over time. This change saves a small amount of native code. Example timings: Mako AOSP AOT: Method: Original / New / Direct call to Math ceil: 596ns / 146.ns / 111ns sqrt: 694ns / 56ns / 25ns Mako AOSP interpreted: Method: Original / New / Direct call to Math ceil: 1900ns / 2307ns / 1485ns sqrt: 1998ns / 2603ns / 1788ns Other calls Mako AOT: Method: Original / New cos: 635ns / 270ns exp: 566ns / 324ns floor: 604ns / 150ns hypot: 631ns / 232ns pow: 936ns / 643ns sin: 641ns / 299ns The advice to use Math directly, in preference to FloatMath, is still good. FloatMath will be deprecated separately. Bug: https://code.google.com/p/android/issues/detail?id=36199 Change-Id: If07fcbd78543d13bc6d75f9743f999860e8d58d7
* | am 84e6d466: am 4cd671e4: Merge "Revert "Replacing FloatMath native ↵Elliott Hughes2014-10-181-0/+1
|\ \ | | | | | | | | | | | | | | | | | | implementation with calls to Math"" * commit '84e6d466edc2aba711f90431a1cd209d11c0e70d': Revert "Replacing FloatMath native implementation with calls to Math"
| * | Revert "Replacing FloatMath native implementation with calls to Math"Elliott Hughes2014-10-181-0/+1
| | | | | | | | | | | | | | | | | | This reverts commit 32b88b48daa7383880088246d7222dd93cf55285. Change-Id: I40ea17f3a68f2b53eb013aebd3ba1becdc724f94
* | | am 8a3785ca: am fd2d41b7: Merge "Replacing FloatMath native implementation ↵Neil Fuller2014-10-161-1/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | with calls to Math" * commit '8a3785cafec4b47fe8d61614b04a0e193d616428': Replacing FloatMath native implementation with calls to Math
| * | Replacing FloatMath native implementation with calls to MathNeil Fuller2014-10-151-1/+0
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On modern versions of Android running in AOT mode FloatMath is slower than Math. Calls to Math.sqrt(), etc. are replaced by intrinsics which can be as small as a single CPU opcode. When running in interpreted mode the new implementation is unfortunately slower, but I'm judging this acceptable and likely to be improved over time. This change saves a small amount of native code. Example timings: Mako AOSP AOT: Method: Original / New / Direct call to Math ceil: 596ns / 146.ns / 111ns sqrt: 694ns / 56ns / 25ns Mako AOSP interpreted: Method: Original / New / Direct call to Math ceil: 1900ns / 2307ns / 1485ns sqrt: 1998ns / 2603ns / 1788ns Other calls Mako AOT: Method: Original / New cos: 635ns / 270ns exp: 566ns / 324ns floor: 604ns / 150ns hypot: 631ns / 232ns pow: 936ns / 643ns sin: 641ns / 299ns The advice to use Math directly, in preference to FloatMath, is still good. FloatMath will be deprecated separately. Bug: https://code.google.com/p/android/issues/detail?id=36199 Change-Id: I8d1947d88b3c576643138b1df589fb9da7c1ab88
* | am 7d113829: am b6f891c4: Merge "Remove MALLOC_LEAK_CHECK references."Christopher Ferris2014-09-201-4/+0
|\ \ | |/ | | | | | | * commit '7d1138298b37bca2340fc4610090b53f5b838f7a': Remove MALLOC_LEAK_CHECK references.
| * Remove MALLOC_LEAK_CHECK references.Christopher Ferris2014-09-191-4/+0
| | | | | | | | | | Bug: 17378595 Change-Id: Ib9680ef97dfea6bc20d96f0bed90f4553186315c
* | resolved conflicts for merge of 1a4527ce to lmp-dev-plus-aospDan Albert2014-09-191-1/+3
|\ \ | |/ | | | | Change-Id: Iee4e93e3a2b049ec5f13166dbbffdd77b301fe5c
| * Clean up makefile cruft.Dan Albert2014-09-111-1/+3
| | | | | | | | | | | | The build system already takes care of all these things. Change-Id: Idef80b554e07cef5e5ed2adf1b5740a76f13ef6d
| * Integrate NativeActivity with NativeBridge interfacesYong WU2014-08-151-1/+2
| | | | | | | | | | | | Bug: 16884833 Change-Id: I73aab8e212860ba5aee9444d801806d3da326a41
| * Rewriting android.text.format.Time without the native _tz functionsNeil Fuller2014-07-221-2/+0
| | | | | | | | | | Bug: 15765976 Change-Id: I666b72ecf9da8a9dcfb97cc503006b415909a558
* | Trim unnecessary pages when printing.Svetoslav2014-09-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A user may request a subset of the document's pages to be printed. In this case the expectation is that the resulting document does not include not selected pages. While print serivices can do the trimming themselves or the printer may do so, moving, potantually many, redundant pages is inefficient. The real problem is when saving to a PDF file where the saved file must not have the pages the user did not select. This change adds shredding of undesired pages from the PDF before saving it or passing it to a print service. : bug:17285994 Change-Id: I7deba535af99457bea3c118202314f0f3812e809
* | Integrate NativeActivity with NativeBridge interfacesYong WU2014-08-151-0/+1
| | | | | | | | | | | | | | | | Bug: 16884833 (cherry picked from commit I73aab8e212860ba5aee9444d801806d3da326a41) Change-Id: I67f037ea81d2a4ede4294afd8b84b7640e534a13
generated by cgit v1.1 at 2024-09-16 04:45:06 +0000