Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't add API annotations in the internal R.java

Browse Source 
I'm trying to enable a check for the following structure:
```
/** @hide */
public class Class1 {
    /** @hide */
    @SystemApi // Invalid because the class is hidden.
    public void method1() { }
}
```

The internal R.java file violates this, which this change is going to fix.

Bug: 159162473
Test: build (treehugger)
Test: atest aapt2_tests

Change-Id: I613e8611ddaf5f8e4761d351d4cd0142d59c7cc9
This commit is contained in:
Makoto Onuki
2020-06-22 10:17:02 -07:00
parent 42a637d4ee
commit de6e6f2098
8 changed files with 108 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tools/aapt2/java/AnnotationProcessor_test.cpp
View File

@@ -91,6 +91,21 @@ TEST(AnnotationProcessorTest, EmitsTestApiAnnotationAndRemovesFromComment) {
EXPECT_THAT(annotations, HasSubstr("This is a test API"));
}
TEST(AnnotationProcessorTest, NotEmitSystemApiAnnotation) {
AnnotationProcessor processor;
processor.AppendComment("@SystemApi This is a system API");
std::string annotations;
StringOutputStream out(&annotations);
Printer printer(&out);
processor.Print(&printer, true /* strip_api_annotations */);
out.Flush();
EXPECT_THAT(annotations, Not(HasSubstr("@android.annotation.SystemApi")));
EXPECT_THAT(annotations, Not(HasSubstr("@SystemApi")));
EXPECT_THAT(annotations, HasSubstr("This is a system API"));
}
TEST(AnnotationProcessor, ExtractsFirstSentence) {
EXPECT_THAT(AnnotationProcessor::ExtractFirstSentence("This is the only sentence"),
Eq("This is the only sentence"));