diff options
| author | 2021-12-01 12:29:37 +0000 | |
|---|---|---|
| committer | 2021-12-01 12:29:37 +0000 | |
| commit | 2258b889bf12d41f67d17f9ce7fe049ee4778073 (patch) | |
| tree | 1ba537b9e6aaa86fa0b7afc77fa0ba3e31bf655e /java/classpath_fragment.go | |
| parent | f517a9c6312d7fae4997fe779ae272d00cb6da39 (diff) | |
| parent | cee9e19a510ca7b1a06589c714b7e8775699632c (diff) | |
Merge "Add entries for STANDALONE_SYSTEMSERVER_JARS to systemserverclasspath.pb"
Diffstat (limited to 'java/classpath_fragment.go')
| -rw-r--r-- | java/classpath_fragment.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/java/classpath_fragment.go b/java/classpath_fragment.go index f63d81d6e..d1d9e73da 100644 --- a/java/classpath_fragment.go +++ b/java/classpath_fragment.go @@ -25,7 +25,7 @@ import ( "android/soong/android" ) -// Build rules and utilities to generate individual packages/modules/SdkExtensions/proto/classpaths.proto +// Build rules and utilities to generate individual packages/modules/common/proto/classpaths.proto // config files based on build configuration to embed into /system and /apex on a device. // // See `derive_classpath` service that reads the configs at runtime and defines *CLASSPATH variables @@ -34,14 +34,15 @@ import ( type classpathType int const ( - // Matches definition in packages/modules/SdkExtensions/proto/classpaths.proto + // Matches definition in packages/modules/common/proto/classpaths.proto BOOTCLASSPATH classpathType = iota DEX2OATBOOTCLASSPATH SYSTEMSERVERCLASSPATH + STANDALONE_SYSTEMSERVER_JARS ) func (c classpathType) String() string { - return [...]string{"BOOTCLASSPATH", "DEX2OATBOOTCLASSPATH", "SYSTEMSERVERCLASSPATH"}[c] + return [...]string{"BOOTCLASSPATH", "DEX2OATBOOTCLASSPATH", "SYSTEMSERVERCLASSPATH", "STANDALONE_SYSTEMSERVER_JARS"}[c] } type classpathFragmentProperties struct { |