diff options
author | Matt A. Tobin <email@mattatobin.com> | 2020-02-20 11:22:40 -0500 |
---|---|---|
committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-14 12:48:53 +0200 |
commit | 85621ee9b30dd325b85eecb7137a0d3cb1d38c27 (patch) | |
tree | 58ea007f69579a4146409f87a2c7e5990717726b /widget/android/bindings | |
parent | ee6595e6deca4bb6d9008fb1495c5da7692a2b33 (diff) | |
download | uxp-85621ee9b30dd325b85eecb7137a0d3cb1d38c27.tar.gz |
Issue #1053 - Remove Android Widget Toolkit specific files
Diffstat (limited to 'widget/android/bindings')
-rw-r--r-- | widget/android/bindings/AndroidRect-classes.txt | 2 | ||||
-rw-r--r-- | widget/android/bindings/Bundle-classes.txt | 1 | ||||
-rw-r--r-- | widget/android/bindings/KeyEvent-classes.txt | 1 | ||||
-rw-r--r-- | widget/android/bindings/Makefile.in | 27 | ||||
-rw-r--r-- | widget/android/bindings/MediaCodec-classes.txt | 5 | ||||
-rw-r--r-- | widget/android/bindings/MotionEvent-classes.txt | 1 | ||||
-rw-r--r-- | widget/android/bindings/SurfaceTexture-classes.txt | 2 | ||||
-rw-r--r-- | widget/android/bindings/ViewConfiguration-classes.txt | 1 | ||||
-rw-r--r-- | widget/android/bindings/moz.build | 41 |
9 files changed, 0 insertions, 81 deletions
diff --git a/widget/android/bindings/AndroidRect-classes.txt b/widget/android/bindings/AndroidRect-classes.txt deleted file mode 100644 index cbacca81e1..0000000000 --- a/widget/android/bindings/AndroidRect-classes.txt +++ /dev/null @@ -1,2 +0,0 @@ -android.graphics.Rect -android.graphics.RectF diff --git a/widget/android/bindings/Bundle-classes.txt b/widget/android/bindings/Bundle-classes.txt deleted file mode 100644 index 9f535cddbe..0000000000 --- a/widget/android/bindings/Bundle-classes.txt +++ /dev/null @@ -1 +0,0 @@ -android.os.Bundle diff --git a/widget/android/bindings/KeyEvent-classes.txt b/widget/android/bindings/KeyEvent-classes.txt deleted file mode 100644 index b73e621efc..0000000000 --- a/widget/android/bindings/KeyEvent-classes.txt +++ /dev/null @@ -1 +0,0 @@ -android.view.KeyEvent diff --git a/widget/android/bindings/Makefile.in b/widget/android/bindings/Makefile.in deleted file mode 100644 index ea66e6022b..0000000000 --- a/widget/android/bindings/Makefile.in +++ /dev/null @@ -1,27 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -# Bug 1099345 - The SDK's lint code (used by the code generator) does not enjoy -# concurrent access to a cache that it generates. -.NOTPARALLEL: - -annotation_processor_jar_files := \ - $(DEPTH)/build/annotationProcessors/annotationProcessors.jar \ - $(ANDROID_TOOLS)/lib/lint.jar \ - $(ANDROID_TOOLS)/lib/lint-checks.jar \ - $(NULL) - -sdk_processor := \ - $(JAVA) \ - -Dcom.android.tools.lint.bindir='$(ANDROID_TOOLS)' \ - -classpath $(subst $(NULL) ,:,$(strip $(annotation_processor_jar_files))) \ - org.mozilla.gecko.annotationProcessors.SDKProcessor - -# For the benefit of readers: the following pattern rule says that, -# for example, MediaCodec.cpp and MediaCodec.h can be produced from -# MediaCodec-classes.txt. This formulation invokes the SDK processor -# at most once. - -%.cpp %.h: $(ANDROID_SDK)/android.jar %-classes.txt $(annotation_processor_jar_files) - $(sdk_processor) $(ANDROID_SDK)/android.jar $(srcdir)/$*-classes.txt $(CURDIR) $* 16 diff --git a/widget/android/bindings/MediaCodec-classes.txt b/widget/android/bindings/MediaCodec-classes.txt deleted file mode 100644 index ea26029aff..0000000000 --- a/widget/android/bindings/MediaCodec-classes.txt +++ /dev/null @@ -1,5 +0,0 @@ -android.media.MediaCodec -android.media.MediaCodec$BufferInfo -android.media.MediaCodec$CryptoInfo -android.media.MediaDrm$KeyStatus -android.media.MediaFormat diff --git a/widget/android/bindings/MotionEvent-classes.txt b/widget/android/bindings/MotionEvent-classes.txt deleted file mode 100644 index dd38dc000f..0000000000 --- a/widget/android/bindings/MotionEvent-classes.txt +++ /dev/null @@ -1 +0,0 @@ -android.view.MotionEvent diff --git a/widget/android/bindings/SurfaceTexture-classes.txt b/widget/android/bindings/SurfaceTexture-classes.txt deleted file mode 100644 index 5c7ca89688..0000000000 --- a/widget/android/bindings/SurfaceTexture-classes.txt +++ /dev/null @@ -1,2 +0,0 @@ -android.graphics.SurfaceTexture -android.view.Surface diff --git a/widget/android/bindings/ViewConfiguration-classes.txt b/widget/android/bindings/ViewConfiguration-classes.txt deleted file mode 100644 index e6601e65f9..0000000000 --- a/widget/android/bindings/ViewConfiguration-classes.txt +++ /dev/null @@ -1 +0,0 @@ -android.view.ViewConfiguration diff --git a/widget/android/bindings/moz.build b/widget/android/bindings/moz.build deleted file mode 100644 index 1bd71fa957..0000000000 --- a/widget/android/bindings/moz.build +++ /dev/null @@ -1,41 +0,0 @@ -# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- -# vim: set filetype=python: -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -# List of stems to generate .cpp and .h files for. To add a stem, add it to -# this list and ensure that $(stem)-classes.txt exists in this directory. -generated = [ - 'AndroidRect', - 'Bundle', - 'KeyEvent', - 'MediaCodec', - 'MotionEvent', - 'SurfaceTexture', - 'ViewConfiguration' -] - -SOURCES += ['!%s.cpp' % stem for stem in generated] - -EXPORTS += ['!%s.h' % stem for stem in generated] - -# We'd like to add these to a future GENERATED_EXPORTS list, but for now we mark -# them as generated here and manually install them in Makefile.in. -GENERATED_FILES += [stem + '.h' for stem in generated] - -# There is an unfortunate race condition when using generated SOURCES and -# pattern rules (see Makefile.in) that manifests itself as a VPATH resolution -# conflict: MediaCodec.o looks for MediaCodec.cpp and $(CURDIR)/MediaCodec.cpp, -# and the pattern rule is matched but doesn't resolve both sources, causing a -# failure. Adding the SOURCES to GENERATED_FILES causes the sources -# to be built at export time, which is before MediaCodec.o needs them; and by -# the time MediaCodec.o is built, the source is in place and the VPATH -# resolution works as expected. -GENERATED_FILES += [f[1:] for f in SOURCES] - -FINAL_LIBRARY = 'xul' - -LOCAL_INCLUDES += [ - '/widget/android', -] |