Remove redundant definitions of constexpr data.

Avoid compiler warning:
    out-of-line definition of constexpr static data member
    is redundant in C++17 and is deprecated

Test: buildbot-build.sh
Change-Id: I213260298833db843a9e4153afd8814af7efa994

11 files changed, 0 insertions, 55 deletions

diff --git a/dexlayout/dex_writer.cc b/dexlayout/dex_writer.cc
index 7f05ae89fb..e7473c0a60 100644
--- a/dexlayout/dex_writer.cc
+++ b/dexlayout/dex_writer.cc
@@ -30,8 +30,6 @@
 
 namespace art {
 
-constexpr uint32_t DexWriter::kDataSectionAlignment;
-
 static size_t EncodeIntValue(int32_t value, uint8_t* buffer) {
   size_t length = 0;
   if (value >= 0) {
diff --git a/libartbase/Android.bp b/libartbase/Android.bp
index 5d78a36468..f2f71cc9d3 100644
--- a/libartbase/Android.bp
+++ b/libartbase/Android.bp
@@ -39,7 +39,6 @@ cc_defaults {
         "base/file_utils.cc",
         "base/flags.cc",
         "base/hex_dump.cc",
-        "base/hiddenapi_flags.cc",
         "base/logging.cc",
         "base/malloc_arena_pool.cc",
         "base/membarrier.cc",
diff --git a/libartbase/base/hiddenapi_flags.cc b/libartbase/base/hiddenapi_flags.cc
deleted file mode 100644
index ea57cb7c5e..0000000000
--- a/libartbase/base/hiddenapi_flags.cc
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "hiddenapi_flags.h"
-
-namespace art {
-namespace hiddenapi {
-
-constexpr const char* ApiList::kValueNames[ApiList::kValueCount];
-constexpr const char* ApiList::kDomainApiNames[ApiList::kDomainApiCount];
-constexpr SdkVersion ApiList::kMaxSdkVersions[ApiList::kValueCount];
-
-}  // namespace hiddenapi
-}  // namespace art
diff --git a/libdexfile/dex/compact_dex_file.cc b/libdexfile/dex/compact_dex_file.cc
index a5044aad7e..205b829393 100644
--- a/libdexfile/dex/compact_dex_file.cc
+++ b/libdexfile/dex/compact_dex_file.cc
@@ -22,9 +22,6 @@
 
 namespace art {
 
-constexpr uint8_t CompactDexFile::kDexMagic[kDexMagicSize];
-constexpr uint8_t CompactDexFile::kDexMagicVersion[];
-
 void CompactDexFile::WriteMagic(uint8_t* magic) {
   std::copy_n(kDexMagic, kDexMagicSize, magic);
 }
diff --git a/libdexfile/dex/compact_offset_table.cc b/libdexfile/dex/compact_offset_table.cc
index 8601b19613..deec124193 100644
--- a/libdexfile/dex/compact_offset_table.cc
+++ b/libdexfile/dex/compact_offset_table.cc
@@ -21,8 +21,6 @@
 
 namespace art {
 
-constexpr size_t CompactOffsetTable::kElementsPerIndex;
-
 CompactOffsetTable::Accessor::Accessor(const uint8_t* data_begin,
                                        uint32_t minimum_offset,
                                        uint32_t table_offset)
diff --git a/runtime/base/timing_logger.cc b/runtime/base/timing_logger.cc
index abf4f58b2c..c39b44e93d 100644
--- a/runtime/base/timing_logger.cc
+++ b/runtime/base/timing_logger.cc
@@ -33,8 +33,6 @@
 
 namespace art {
 
-constexpr size_t TimingLogger::kIndexNotFound;
-
 CumulativeLogger::CumulativeLogger(const std::string& name)
     : name_(name),
       lock_name_("CumulativeLoggerLock" + name),
diff --git a/runtime/gc/accounting/card_table.cc b/runtime/gc/accounting/card_table.cc
index fdf1615f5e..b8b328c795 100644
--- a/runtime/gc/accounting/card_table.cc
+++ b/runtime/gc/accounting/card_table.cc
@@ -31,11 +31,6 @@ namespace art {
 namespace gc {
 namespace accounting {
 
-constexpr size_t CardTable::kCardShift;
-constexpr size_t CardTable::kCardSize;
-constexpr uint8_t CardTable::kCardClean;
-constexpr uint8_t CardTable::kCardDirty;
-
 /*
  * Maintain a card table from the write barrier. All writes of
  * non-null values to heap addresses should go through an entry in
diff --git a/runtime/index_bss_mapping.cc b/runtime/index_bss_mapping.cc
index 8d9d8cfe63..f6e083d613 100644
--- a/runtime/index_bss_mapping.cc
+++ b/runtime/index_bss_mapping.cc
@@ -44,8 +44,6 @@ size_t IndexBssMappingEntry::GetBssOffset(size_t index_bits,
   }
 }
 
-constexpr size_t IndexBssMappingLookup::npos;
-
 size_t IndexBssMappingLookup::GetBssOffset(const IndexBssMapping* mapping,
                                            uint32_t index,
                                            uint32_t number_of_indexes,
diff --git a/runtime/mirror/class.cc b/runtime/mirror/class.cc
index 4597416faf..79676007c1 100644
--- a/runtime/mirror/class.cc
+++ b/runtime/mirror/class.cc
@@ -59,10 +59,6 @@
 
 namespace art {
 
-// TODO: move to own CC file?
-constexpr size_t BitString::kBitSizeAtPosition[BitString::kCapacity];
-constexpr size_t BitString::kCapacity;
-
 namespace mirror {
 
 using android::base::StringPrintf;
diff --git a/runtime/oat.cc b/runtime/oat.cc
index 64ed14ac41..42bb7d4894 100644
--- a/runtime/oat.cc
+++ b/runtime/oat.cc
@@ -29,9 +29,6 @@ namespace art {
 
 using android::base::StringPrintf;
 
-constexpr const char OatHeader::kTrueValue[];
-constexpr const char OatHeader::kFalseValue[];
-
 static size_t ComputeOatHeaderSize(const SafeMap<std::string, std::string>* variable_data) {
   size_t estimate = 0U;
   if (variable_data != nullptr) {
diff --git a/runtime/vdex_file.cc b/runtime/vdex_file.cc
index fb3f809381..f07233c9c9 100644
--- a/runtime/vdex_file.cc
+++ b/runtime/vdex_file.cc
@@ -49,10 +49,6 @@ namespace art {
 
 using android::base::StringPrintf;
 
-constexpr uint8_t VdexFile::VdexFileHeader::kVdexInvalidMagic[4];
-constexpr uint8_t VdexFile::VdexFileHeader::kVdexMagic[4];
-constexpr uint8_t VdexFile::VdexFileHeader::kVdexVersion[4];
-
 bool VdexFile::VdexFileHeader::IsMagicValid() const {
   return (memcmp(magic_, kVdexMagic, sizeof(kVdexMagic)) == 0);
 }