From 4255d7f0514c5fa1badded6b0bc445ec2d2764c0 Mon Sep 17 00:00:00 2001
From: Po Lu
Date: Thu, 26 Jan 2023 15:37:04 +0800
Subject: Update Android port

* .gitignore: Ignore lib/math.h.
* INSTALL.android: Update accordingly.
* build-aux/ndk-build-helper-1.mk:
* build-aux/ndk-build-helper-2.mk:
* build-aux/ndk-build-helper.mk:
* build-aux/ndk-module-extract.awk: Handle C++ modules.
* configure.ac: Enable libxml2 on Android.

* cross/ndk-build/Makefile.in:
* cross/ndk-build/ndk-build-shared-library.mk:
* cross/ndk-build/ndk-build-static-library.mk:
* cross/ndk-build/ndk-build.mk.in:
* cross/ndk-build/ndk-resolve.mk: Fix dependency resolution of
includes.

* java/org/gnu/emacs/EmacsView.java (popupMenu): Fix minimum SDK
version for actual popup menus.
* lib/math.h: Delete file.

* m4/ndk-build.m4 (ndk_SEARCH_MODULE, ndk_CHECK_MODULES): Look
for nasm and C++ libraries.

* src/android.c (faccessat): Rename to `android_faccessat'.
* src/android.h: Update prototypes.
* src/dired.c (file_name_completion_dirp):
* src/fileio.c (file_access_p, Faccess_file, file_directory_p):
* src/lisp.h:
* src/lread.c (openp):
* src/process.c (allocate_pty): Use sys_faccessat.
* src/sysdep.c (sys_faccessat): New function.
---
 java/org/gnu/emacs/EmacsView.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'java')

diff --git a/java/org/gnu/emacs/EmacsView.java b/java/org/gnu/emacs/EmacsView.java
index 881cbc363ba..a1953f683bd 100644
--- a/java/org/gnu/emacs/EmacsView.java
+++ b/java/org/gnu/emacs/EmacsView.java
@@ -531,8 +531,9 @@ public class EmacsView extends ViewGroup
     contextMenu = menu;
     popupActive = true;
 
-    /* On API 21 or later, use showContextMenu (float, float).  */
-    if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP)
+    /* Use showContextMenu (float, float) on N to get actual popup
+       behavior.  */
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
       return showContextMenu ((float) xPosition, (float) yPosition);
     else
       return showContextMenu ();
-- 
cgit v1.2.1