34 Commits

Author SHA1 Message Date
Dan Willemsen
3dcf031866 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
Change-Id: Ic10796e75bb886cc3f92c234714ab3e6c85112df
2017-04-10 12:54:37 -07:00
John Reck
00799f760d Fix NDK access to recycle'd bitmaps
Also kills off one user of GraphicsJNI.h!

Change-Id: Icbf979e485b3b6ec2f37e18ff654b8ff1e44fb35
Fixes: 34712423
Test: cts CtsGraphicsTestCases --test android.graphics.cts.BitmapTest#testNdkAccessAfterRecycle passes
2017-03-01 18:11:04 -08:00
Mathias Agopian
f1cb02e7b5 fallout of splitting rect.h out of libandroid.
- Main goal here: libandroid now links against 
libarect and export its includes.

- Also fix some wrongful makefiles that included 
headers without proper dependency list.

Test: built and booted device
Bug: 35164655
Change-Id: Iae17b966bba00fe53424486a75eebff468873787
2017-02-17 12:25:26 -08:00
Dan Albert
98e462df7d Unversion NDK stub libraries.
The system versions of these libraries aren't versioned yet.

Bug: https://github.com/android-ndk/ndk/issues/278
Test: make ndk
Change-Id: I74e988be8f60f8728a0bfa7360091cbd9f5b1186
2017-01-06 11:04:14 -08:00
John Reck
03b5d506bc Re-unite sources with their headers
Move all the includes for androidfw under
a common base path for that library instead
of frameworks/base/includes.

Also fixes -Werror issues that resulted in
no longer being -isystem.

Test: builds
Change-Id: Ic4312eb61b197af114dded5691d5ae1ec82923f7
Merged-In: Ic4312eb61b197af114dded5691d5ae1ec82923f7
(cherry picked from commit f6113af2d6f6eebee68d3ac510fe96d38a7a39e9)
2016-11-04 13:27:37 -07:00
Dan Albert
7ce8df32a7 Move libjnigraphics to ndk_library.
The headers are already migrated because they're in
frameworks/native/include/android, which was covered when migrating
libandroid.

Test: make native
Bug: http://b/30465923
Change-Id: I610dc6c613f2a408960088a86629073da38682a0
2016-09-27 13:59:05 -07:00
Dimitry Ivanov
ef9e04b210 am 66f5affb: Merge "Fix bug number for linker related workarounds"
* commit '66f5affbe41a49bedf35e73b7c7f482db6e2fa7b':
  Fix bug number for linker related workarounds
2015-09-28 18:23:56 +00:00
Dmitriy Ivanov
ad1cf03e80 Fix bug number for linker related workarounds
Bug: http:/b/24425865
Change-Id: Iba52acc99c8ff548ff875726988600ed230c988e
2015-09-28 10:37:49 -07:00
Dmitriy Ivanov
b5228ac076 Switch libjnigraphics.so to hash-style=both
Bug: http://b/19059885
Change-Id: I15f70b434b1d450e5b62ca7c204c628e2dc9edcc
(cherry picked from commit 2e84bc6948bb24ec67bf289ee1d0ed937a0fd4ff)
2015-05-08 14:18:38 -07:00
Dmitriy Ivanov
2e84bc6948 Switch libjnigraphics.so to hash-style=both
Bug: http://b/19059885
Change-Id: I15f70b434b1d450e5b62ca7c204c628e2dc9edcc
2015-05-08 21:07:29 +00:00
John Reck
ae2e8b4891 Add warning if an in-use Bitmap is reconfigured
Bug: 18928352

Also fix an issue around re-configure not properly handling
mPinnedCount in android::Bitmap

Change-Id: I1815b121f1474ad931060771bb1d52ef31d2aac7
2015-05-06 15:30:16 -07:00
John Reck
ed207b9274 Change how Java Bitmaps are accessed in a few places
Stop assuming that a Java Bitmap has a SkBitmap* that
has some externally managed lifecycle, and instead switch
a bunch of users to accessing the bitmap by providing
their own SkBitmap* on which to set the (ref counted!)
SkPixelRef* instead

Attempt #2 to land this, original issue was in getSkBitmap
and should be fixed

Change-Id: I0fd9e193968b41e5597784140d56b4885906864a
2015-04-30 12:46:57 -07:00
John Reck
c1b33d665c GraphicsJNI Canvas cleanup
Change-Id: I72e142986a8bc9f464c1951b6b5187919de3462e
2015-04-22 09:34:34 -07:00
John Reck
edc22fba59 Revert "Change how Java Bitmaps are accessed in a few places"
Bug: 20207616

This reverts commit a771b9861d11671c780092d35c0062eeefcf37c0.

Change-Id: Ifd891cc075274a7986e987229e0fed5a04ed9ff0
2015-04-20 22:06:31 +00:00
John Reck
a771b9861d Change how Java Bitmaps are accessed in a few places
Stop assuming that a Java Bitmap has a SkBitmap* that
has some externally managed lifecycle, and instead switch
a bunch of users to accessing the bitmap by providing
their own SkBitmap* on which to set the (ref counted!)
SkPixelRef* instead

Change-Id: I0fd9e193968b41e5597784140d56b4885906864a
2015-04-13 09:50:42 -07:00
Dmitriy Ivanov
5a565ef01c am 1c8b3778: am 9aeb080e: Merge "Switch libjnigraphics to sysv-only hash style"
* commit '1c8b3778e1c380992a9ca96e965cdc4e6f3bca66':
  Switch libjnigraphics to sysv-only hash style
2015-03-13 21:59:25 +00:00
Dmitriy Ivanov
ca4f2e838c Switch libjnigraphics to sysv-only hash style
Bug: 19059885
Change-Id: I3474974983931c67dce30dfc581a8d28d8b62e6a
2015-03-13 12:49:47 -07:00
Dimitry Ivanov
b8d342da4e am 3b9cfe30: am a6ed1b95: am 6e116429: Merge "Generate gnu hash for arm only"
* commit '3b9cfe30ed4ae34d06a8f005c8ada593c314316b':
  Generate gnu hash for arm only
2015-03-11 20:09:17 +00:00
Dmitriy Ivanov
ae0d6f34c5 am 1944667b: am 8ced0357: am 2a88ff2f: Merge "Generate sysv hash for libjnigraphics"
* commit '1944667b7f70c336da66cc3fbdee3a2fbd766980':
  Generate sysv hash for libjnigraphics
2015-03-11 00:23:26 +00:00
Goran Jakovljevic
12f4749df8 Generate gnu hash for arm only
Fixes build failure caused by:
https://android-review.googlesource.com/#/c/139670/

As previously discussed [1], MIPS does not support GNU-style ELF hashes.

[1] https://android-review.googlesource.com/#/c/49282/2/tests/Android.mk

Change-Id: I8edb8a1595308db2ecd1bd6650a069b1224ae64f
2015-03-10 09:50:51 -07:00
Dmitriy Ivanov
1dc91a5f7a Generate sysv hash for libjnigraphics
Bug: 19059885
Change-Id: I9b227fda6549e15a5ce50ac6b59250dff1371bb3
2015-03-09 19:42:16 -07:00
John Reck
f4faeac352 Cleanup Bitmap JNI attempt #2
Original version missed a spot

This reverts commit c02977e3bbfaaedcb1b1d67e1692becc7dddd59b.

Change-Id: I56244ce10d709fcdef42a001fe4c6ba7b6bbb04d
2015-03-05 13:56:16 -08:00
Chad Jones
c02977e3bb Revert "Cleanup Bitmap JNI"
This reverts commit b2915245b74b3b5541b123e38403f8e26426b4b7.

Change-Id: Idd7d7f33eec4ea5024c83de6b10d3d1a6ab2b17a
2015-03-05 19:34:26 +00:00
John Reck
b2915245b7 Cleanup Bitmap JNI
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
2015-03-05 09:55:02 -08:00
Andreas Gampe
cad87d78da Frameworks/base: Wall Werror in native/graphics
Turn on -Wall -Werror in native/graphics. Mask skia warnings.

Change-Id: Ia671e91348296ace84d9a24b3c6c025fa889bead
2014-11-10 17:14:31 -08:00
Mike Reed
1103b32559 SkBitmap::Config is deprecated, use SkColorType
Change-Id: Ic953741325607bf85598c097bb3ab648d4a08996
2014-07-08 15:05:38 -04:00
Derek Sollenberger
950fe8f8d4 Cleanup unnecessary includes for libskia.
The libskia target exports all of its public includes directories so
redefining them here is redundant. Also this cleans up and makes it
obvious where the framework is making using of private Skia headers.

Change-Id: Ie7ecc9ddd3df780bed6b9af54ba58ca58274e043
2014-02-27 16:21:24 +00:00
Andreas Huber
9ae000ca8c Revert "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest."
This reverts commit 7825334929b098b36e1144872200e75ba6d24b13.

Change-Id: I1702eb3ff9d7192d64039c8bf4bc3fc5d8e458c4
2014-02-13 17:22:33 +00:00
Andreas Huber
7825334929 Split AndroidRuntime into AndroidRuntimeBase base-class and the rest.
AndroidRuntimeBase (exported by libandroid_runtime_base.so) is all you need
to link against to gain the ability to do AndroidRuntimeBase::getJNIEnv()
thus minimizing build dependencies.

Change-Id: Ia7f0c94c8c02b974c068e0db34774827f96aa95b
2014-02-12 15:00:05 -08:00
Andrew Hsieh
eba8254c8c Fix typo
Changed ANDROID_BITMAP_RESUT_SUCCESS -> ANDROID_BITMAP_RESULT_SUCCESS

Change-Id: I3d5525d7dacbf8f007e3230e1ca87b69245a96b1
2012-12-12 11:27:44 +08:00
Elliott Hughes
89269cf98d libnativehelper is implicitly available.
(And is moving for the PDK.)

Bug: 6369821
Change-Id: I9e082ef294cfb2d70384255eb06d97d8cb92b382
2012-05-03 16:39:22 -07:00
Alexandre Elias
17e5f4cc70 Add notifyPixelsChanged() call to NDK unlockPixels().
Without this call, the NDK bitmap methods don't work in
hardware-accelerated mode ( http://b/5017848 ).

Change-Id: Icae6975757c9c9e83c0e9fc132161aa3004f8f28
2011-07-12 18:08:10 -07:00
Dan Bornstein
782e9fd749 For issue #2651381, allow library prelinking.
Change-Id: I1cb467a158e21fc02cac6af585ac8d27c2bf42de
2010-05-05 18:23:05 -07:00
Dima Zavin
3227631fe9 Move the NDK graphics wrapper (libjnigraphics) to frameworks/base/native
Change-Id: I2a5adde9f8e4683c4b4526a29ad276c3e581e029
Signed-off-by: Dima Zavin <dima@android.com>
2010-02-04 15:31:19 -08:00