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

Commit a8ba4c1a authored by Pete Gillin's avatar Pete Gillin Committed by android-build-merger
Browse files

Merge "Stop reading the generated ojluni sources in droiddoc." am: 8ab61fb0 am: 493a6bdd 

am: 1d44a65d

Change-Id: I00155038e50cbe3704f34085f79721d19bdbf534
parents a1601351 1d44a65d

Android.bp

+0 −12
Original line number Diff line number Diff line
@@ -1056,10 +1056,6 @@ doc_defaults { 
        ":openjdk_javadoc_files",

        ":non_openjdk_javadoc_files",

        ":android_icu4j_src_files_for_docs",

        ":gen-ojluni-jaif-annotated-srcs",

    ],

    exclude_srcs: [

        ":annotated_ojluni_files",

    ],

    srcs_lib: "framework",

    srcs_lib_whitelist_dirs: frameworks_base_subdirs,
@@ -1106,13 +1102,9 @@ doc_defaults { 
        ":openjdk_javadoc_files",

        ":non_openjdk_javadoc_files",

        ":android_icu4j_src_files_for_docs",

        ":gen-ojluni-jaif-annotated-srcs",

        "test-mock/src/**/*.java",

        "test-runner/src/**/*.java",

    ],

    exclude_srcs: [

        ":annotated_ojluni_files",

    ],

    srcs_lib: "framework",

    srcs_lib_whitelist_dirs: frameworks_base_subdirs,

    srcs_lib_whitelist_pkgs: packages_to_document,
@@ -1491,10 +1483,6 @@ doc_defaults { 
        ":openjdk_javadoc_files",

        ":non_openjdk_javadoc_files",

        ":android_icu4j_src_files_for_docs",

        ":gen-ojluni-jaif-annotated-srcs",

    ],

    exclude_srcs: [

        ":annotated_ojluni_files",

    ],

    srcs_lib: "framework",

    srcs_lib_whitelist_dirs: frameworks_base_subdirs,