diff options
| author | Po Lu | 2023-10-13 12:57:30 +0800 |
|---|---|---|
| committer | Po Lu | 2023-10-13 12:57:36 +0800 |
| commit | 963e3dd28daaf335bceaec6deef157467c5ae6d0 (patch) | |
| tree | e211262dc98b45b17e993f4155d9c036ce64c830 /java | |
| parent | 29095d0b1cc5e5b0e4ee089deb59f44f950872ff (diff) | |
| download | emacs-963e3dd28daaf335bceaec6deef157467c5ae6d0.tar.gz emacs-963e3dd28daaf335bceaec6deef157467c5ae6d0.zip | |
Clarify java/INSTALL
* java/INSTALL: Correct erroneous include exports and also
introduce those omitted within patches to external libraries.
(bug#66507)
Diffstat (limited to 'java')
| -rw-r--r-- | java/INSTALL | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/java/INSTALL b/java/INSTALL index b6c31483dd3..fb221c5e2b4 100644 --- a/java/INSTALL +++ b/java/INSTALL | |||
| @@ -299,6 +299,8 @@ work, along with what has to be patched to make them work: | |||
| 299 | the following three dependencies.) | 299 | the following three dependencies.) |
| 300 | libpackagelistparser | 300 | libpackagelistparser |
| 301 | https://android.googlesource.com/platform/system/core/+/refs/heads/nougat-mr1-dev/libpackagelistparser/ | 301 | https://android.googlesource.com/platform/system/core/+/refs/heads/nougat-mr1-dev/libpackagelistparser/ |
| 302 | (You must add LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include before | ||
| 303 | its Android.mk includes $(BUILD_SHARED_LIBRARY)) | ||
| 302 | libpcre - https://android.googlesource.com/platform/external/pcre | 304 | libpcre - https://android.googlesource.com/platform/external/pcre |
| 303 | libcrypto - https://android.googlesource.com/platform/external/boringssl | 305 | libcrypto - https://android.googlesource.com/platform/external/boringssl |
| 304 | (You must apply the patch at the end of this file when building for | 306 | (You must apply the patch at the end of this file when building for |
| @@ -404,14 +406,14 @@ libxml2 before it can be built for Emacs. In addition, you must also | |||
| 404 | revert the commit `edb5870767fed8712a9b77ef34097209b61ab2db'. | 406 | revert the commit `edb5870767fed8712a9b77ef34097209b61ab2db'. |
| 405 | 407 | ||
| 406 | diff --git a/Android.mk b/Android.mk | 408 | diff --git a/Android.mk b/Android.mk |
| 407 | index 07c7b372..24f67e49 100644 | 409 | index 07c7b372..2494274f 100644 |
| 408 | --- a/Android.mk | 410 | --- a/Android.mk |
| 409 | +++ b/Android.mk | 411 | +++ b/Android.mk |
| 410 | @@ -80,6 +80,7 @@ LOCAL_SHARED_LIBRARIES := libicuuc | 412 | @@ -80,6 +80,7 @@ LOCAL_SHARED_LIBRARIES := libicuuc |
| 411 | LOCAL_MODULE:= libxml2 | 413 | LOCAL_MODULE:= libxml2 |
| 412 | LOCAL_CLANG := true | 414 | LOCAL_CLANG := true |
| 413 | LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk | 415 | LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk |
| 414 | +LOCAL_EXPORT_C_INCLUDES += $(LOCAL_PATH) | 416 | +LOCAL_EXPORT_C_INCLUDES += $(LOCAL_PATH)/include |
| 415 | include $(BUILD_SHARED_LIBRARY) | 417 | include $(BUILD_SHARED_LIBRARY) |
| 416 | 418 | ||
| 417 | # For the host | 419 | # For the host |