Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76c275e7 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Gerrit Code Review
Browse files

Merge changes from topic "predicates_aosp" 

* changes:
  Deeper sanity checking of emitted types.
  Emit all APIs using Predicates.
  Massage APIs for upcoming doclava change.
parents a863c7f6 2337aec9

Android.mk

+3 −1
Original line number Diff line number Diff line
@@ -371,7 +371,9 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \ 
    -knowntags ./frameworks/base/docs/knowntags.txt \

    -knowntags ./libcore/known_oj_tags.txt \

    -manifest ./frameworks/base/core/res/AndroidManifest.xml \

    -hidePackage com.android.okhttp \

    -hidePackage com.android.org.conscrypt \

    -hidePackage com.android.server \

    -since $(SRC_API_DIR)/1.xml 1 \

    -since $(SRC_API_DIR)/2.xml 2 \

    -since $(SRC_API_DIR)/3.xml 3 \
@@ -399,7 +401,7 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \ 
    -since $(SRC_API_DIR)/25.txt 25 \

    -since $(SRC_API_DIR)/26.txt 26 \

    -since $(SRC_API_DIR)/27.txt 27 \

    -werror -lerror -hide 111 -hide 113 -hide 121 -hide 125 -hide 126 -hide 127 -hide 128 \

    -werror -lerror -hide 111 -hide 113 -hide 125 -hide 126 -hide 127 -hide 128 \

    -overview $(LOCAL_PATH)/core/java/overview.html \



framework_docs_LOCAL_API_CHECK_ADDITIONAL_JAVA_DIR:= \